Skip to content

The Unified and Autonomous Development Platform

Make sure to associate code comment to pull request after transaction commit

robin shene942bf3347c1
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
index 8e2f64c99a..c91c7d4fd6 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
@@ -92,6 +92,8 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa
private final CodeCommentManager codeCommentManager;
+ private final Dao dao;
+
@Inject
public DefaultCodeCommentRelationInfoManager(Dao dao, ProjectManager projectManager, StorageManager storageManager,
PullRequestUpdateManager pullRequestUpdateManager, CodeCommentManager codeCommentManager,
@@ -105,6 +107,7 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa
this.unitOfWork = unitOfWork;
this.pullRequestManager = pullRequestManager;
this.codeCommentRelationManager = codeCommentRelationManager;
+ this.dao = dao;
}
private BatchWorker getBatchWorker(Long projectId) {
@@ -300,11 +303,25 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa
public void on(EntityPersisted event) {
if (event.isNew()) {
if (event.getEntity() instanceof PullRequestUpdate) {
- Project project = ((PullRequestUpdate) event.getEntity()).getRequest().getTargetProject();
- batchWorkManager.submit(getBatchWorker(project.getId()), new Prioritized(PRIORITY));
+ Long projectId = ((PullRequestUpdate) event.getEntity()).getRequest().getTargetProject().getId();
+ dao.doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));
+ }
+
+ });
} else if (event.getEntity() instanceof CodeComment) {
- Project project = ((CodeComment)event.getEntity()).getProject();
- batchWorkManager.submit(getBatchWorker(project.getId()), new Prioritized(PRIORITY));
+ Long projectId = ((CodeComment)event.getEntity()).getProject().getId();
+ dao.doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));
+ }
+
+ });
}
}
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index 53b0ac61f8..87aa9d6e34 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -35,7 +35,6 @@ import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
-import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -689,11 +688,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
protected void checkAsync(PullRequest request) {
Long requestId = request.getId();
Subject subject = SecurityUtils.getSubject();
- if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
- dao.doUnitOfWorkAsyncAfterCommit(newCheckStatusRunnable(requestId, subject));
- } else {
- unitOfWork.doAsync(newCheckStatusRunnable(requestId, subject));
- }
+ dao.doUnitOfWorkAsyncAfterCommit(newCheckStatusRunnable(requestId, subject));
}
@Transactional