Merge pull request #117 from robinrosenberg/master

James Moger

2013-09-05 a7eb626b89d8870ce211afc1b4927d98dbe4ed03

Merge pull request #117 from robinrosenberg/master

NPE fix in default branch determination & NPE fix when commit cache contains removed repo

 src/main/java/com/gitblit/GitBlit.java

@@ -3603,7 +3603,7 @@
            Date cutoff = CommitCache.instance().getCutoffDate();
            for (String repositoryName : getRepositoryList()) {
                RepositoryModel model = getRepositoryModel(repositoryName);
                if (model.hasCommits && model.lastChange.after(cutoff)) {
                if (model != null && model.hasCommits && model.lastChange.after(cutoff)) {
                    repoCount++;
                    Repository repository = getRepository(repositoryName);
                    for (RefModel ref : JGitUtils.getLocalBranches(repository, true, -1)) {

 src/main/java/com/gitblit/utils/JGitUtils.java

@@ -566,6 +566,8 @@
        try {

            if (tree == null) {

                ObjectId object = getDefaultBranch(repository);

                if (object == null)

                    return null;

                RevCommit commit = rw.parseCommit(object);

                tree = commit.getTree();

            }