Skip to content

The Unified and Autonomous Development Platform

Always query ref database to get last commit in project list page to make the information accurate

robin shenf9848f90b6da
diff --git a/core/src/main/java/com/gitplex/server/model/Project.java b/core/src/main/java/com/gitplex/server/model/Project.java
index 26f15cf31d..5cf60cf77a 100644
--- a/core/src/main/java/com/gitplex/server/model/Project.java
+++ b/core/src/main/java/com/gitplex/server/model/Project.java
@@ -70,7 +70,6 @@ import com.gitplex.server.git.RefInfo;
import com.gitplex.server.git.Submodule;
import com.gitplex.server.git.exception.NotFileException;
import com.gitplex.server.git.exception.ObjectNotFoundException;
-import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.ConfigManager;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.manager.StorageManager;
@@ -872,28 +871,23 @@ public class Project extends AbstractEntity {
public RevCommit getLastCommit() {
if (lastCommitOptional == null) {
- ObjectId commitId = GitPlex.getInstance(CommitInfoManager.class).getLastCommit(this);
- if (commitId == null) {
- RevCommit lastCommit = null;
- try {
- for (Ref ref: getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values()) {
- RevCommit commit = getRevCommit(ref.getObjectId(), false);
- if (commit != null) {
- if (lastCommit != null) {
- if (commit.getCommitTime() > lastCommit.getCommitTime())
- lastCommit = commit;
- } else {
+ RevCommit lastCommit = null;
+ try {
+ for (Ref ref: getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values()) {
+ RevCommit commit = getRevCommit(ref.getObjectId(), false);
+ if (commit != null) {
+ if (lastCommit != null) {
+ if (commit.getCommitTime() > lastCommit.getCommitTime())
lastCommit = commit;
- }
+ } else {
+ lastCommit = commit;
}
}
- } catch (IOException e) {
- throw new RuntimeException(e);
}
- lastCommitOptional = Optional.fromNullable(lastCommit);
- } else {
- lastCommitOptional = Optional.fromNullable(getRevCommit(commitId));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
+ lastCommitOptional = Optional.fromNullable(lastCommit);
}
return lastCommitOptional.orNull();
}