Преглед изворни кода

Merge pull request #117 from robinrosenberg/master

NPE fix in default branch determination & NPE fix when commit cache contains removed repo
tags/v1.4.0
James Moger пре 10 година
родитељ
комит
a7eb626b89

+ 1
- 1
src/main/java/com/gitblit/GitBlit.java Прегледај датотеку

@@ -3603,7 +3603,7 @@ public class GitBlit implements ServletContextListener {
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)) {

+ 2
- 0
src/main/java/com/gitblit/utils/JGitUtils.java Прегледај датотеку

@@ -566,6 +566,8 @@ public class JGitUtils {
try {
if (tree == null) {
ObjectId object = getDefaultBranch(repository);
if (object == null)
return null;
RevCommit commit = rw.parseCommit(object);
tree = commit.getTree();
}

Loading…
Откажи
Сачувај