Skip to content

The Unified and Autonomous Development Platform

fix issue #161 - NPE when delete a code comment

Robin Shenbf4813767a08
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 5226a05733..c2aaaf74c0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -40,7 +40,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
PullRequest find(ProjectScopedNumber pullRequestFQN);
@Nullable
- PullRequest findLatest(Project targetProject, User submitter);
+ PullRequest findLatest(Project targetProject);
void discard(PullRequest request, @Nullable String note);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index cf0933f2d6..34f91bd2f7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -109,7 +109,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
super.delete(comment);
PullRequest request = comment.getRequest();
- request.setCommentCount(request.getCommentCount() - comment.getReplyCount() - 1);
+ if (request != null)
+ request.setCommentCount(request.getCommentCount() - comment.getReplyCount() - 1);
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 84240e609c..e6ab7bb8b5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -3,7 +3,6 @@ package io.onedev.server.entitymanager.impl;
import static io.onedev.server.model.PullRequest.CriterionHelper.ofOpen;
import static io.onedev.server.model.PullRequest.CriterionHelper.ofSource;
import static io.onedev.server.model.PullRequest.CriterionHelper.ofSourceProject;
-import static io.onedev.server.model.PullRequest.CriterionHelper.ofSubmitter;
import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;
import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;
@@ -623,11 +622,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Sessional
@Override
- public PullRequest findLatest(Project targetProject, User submitter) {
+ public PullRequest findLatest(Project targetProject) {
EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
criteria.add(ofOpen());
criteria.add(Restrictions.or(ofSourceProject(targetProject), ofTargetProject(targetProject)));
- criteria.add(ofSubmitter(submitter));
criteria.addOrder(Order.desc("id"));
return find(criteria);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 0cb028d88e..9e28c580c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -191,7 +191,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
}
AtomicReference<PullRequest> pullRequestRef = new AtomicReference<>(null);
- PullRequest prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());
+ PullRequest prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(target.getProject());
if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())
pullRequestRef.set(prevRequest);
else if (target.getBranch() != null && source.getBranch() != null)
@@ -293,7 +293,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
protected void onSelect(AjaxRequestTarget target, Project project, String branch) {
- PageParameters params = paramsOf(project, new ProjectAndBranch(project, branch), source);
+ PageParameters params = paramsOf(getProject(), new ProjectAndBranch(project, branch), source);
/*
* Use below code instead of calling setResponsePage() to make sure the dropdown is
@@ -349,7 +349,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public void onClick() {
- PageParameters params = paramsOf(source.getProject(), source, target);
+ PageParameters params = paramsOf(getProject(), source, target);
setResponsePage(NewPullRequestPage.class, params);
}
@@ -433,7 +433,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
protected Project getProject() {
- return NewPullRequestPage.this.getProject();
+ return getPullRequest().getSourceProject();
}
}.setOutputMarkupId(true);
@@ -707,7 +707,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
protected Project getProject() {
- return NewPullRequestPage.this.getProject();
+ return target.getProject();
}
});
@@ -905,7 +905,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
protected boolean isPermitted() {
- return SecurityUtils.canReadCode(getProject()) && SecurityUtils.canReadCode(source.getProject());
+ return SecurityUtils.canReadCode(target.getProject()) && SecurityUtils.canReadCode(source.getProject());
}
}