The Unified and Autonomous Development Platform
Fix the issue that editing a file online sometimes causes Hibernate exception in the background
Robin Shenfbd6be49665e
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.javaindex f6008777ee..e52577a765 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java@@ -20,6 +20,7 @@ import io.onedev.server.model.CommitQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.search.commit.CommitQueryUtils;@Singleton@@ -46,6 +47,7 @@ public class DefaultCommitNotificationManager {}}+ @Sessional@Listenpublic void on(RefUpdated event) {if (!event.getNewCommitId().equals(ObjectId.zeroId())) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex fc5d87f069..95ee6e0eec 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -994,9 +994,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {BlobIdent newBlobIdent;getProject().cacheObjectId(branch, refUpdated.getNewCommitId());- Subject subject = SecurityUtils.getSubject();- Long projectId = project.getId();-if (state.mode == Mode.DELETE) {try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {RevTree revTree = getProject().getRevCommit(refUpdated.getNewCommitId()).getTree();@@ -1020,6 +1017,11 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {newBlobIdent = null;}+ Subject subject = SecurityUtils.getSubject();+ Long projectId = project.getId();+ String refName = refUpdated.getRefName();+ ObjectId oldCommitId = refUpdated.getOldCommitId();+ ObjectId newCommitId = refUpdated.getNewCommitId();OneDev.getInstance(UnitOfWork.class).doAsync(new Runnable() {@Override@@ -1028,6 +1030,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {try {Project project = OneDev.getInstance(ProjectManager.class).load(projectId);project.cacheObjectId(branch, refUpdated.getNewCommitId());+ RefUpdated refUpdated = new RefUpdated(project, refName, oldCommitId, newCommitId);OneDev.getInstance(ListenerRegistry.class).post(refUpdated);} finally {ThreadContext.unbindSubject();