Skip to content

The Unified and Autonomous Development Platform

fix issue #94: Error dump on writing comments on Issues board

Robin Shenbe58a4f51b41
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
index 4b58b44ec6..7444b5a36e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
@@ -9,6 +9,8 @@ import org.apache.wicket.Component;
import com.google.common.base.Objects;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
@@ -108,13 +110,14 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {
@Override
public Component render(String componentId, IssueChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected IssueChange getChange() {
- return change;
+ return OneDev.getInstance(IssueChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
index 4b154fa152..468e5aca41 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
@@ -7,6 +7,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.util.CommentSupport;
@@ -75,13 +77,14 @@ public class IssueStateChangeData extends IssueFieldChangeData {
@Override
public Component render(String componentId, IssueChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected IssueChange getChange() {
- return change;
+ return OneDev.getInstance(IssueChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
index 28cef40e9d..37148a3b55 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
@@ -4,6 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -30,13 +32,14 @@ public class PullRequestApproveData implements PullRequestChangeData {
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
index 9e14c6c28d..11187e2587 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
@@ -4,6 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -49,13 +51,14 @@ public class PullRequestDiscardData implements PullRequestChangeData {
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
index dd08d5880f..a650832616 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
@@ -6,6 +6,8 @@ import org.apache.wicket.Component;
import com.google.common.collect.Lists;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -36,13 +38,14 @@ public class PullRequestMergeStrategyChangeData implements PullRequestChangeData
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
index ce1186ce4a..d07dcadc52 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
@@ -4,6 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -49,13 +51,14 @@ public class PullRequestReopenData implements PullRequestChangeData {
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
index 3ba043241b..112a3c5ea5 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
@@ -4,6 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -49,13 +51,14 @@ public class PullRequestRequestedForChangesData implements PullRequestChangeData
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
index 338cbeb904..30a8a06bb1 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
@@ -4,6 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -49,13 +51,14 @@ public class PullRequestSourceBranchDeleteData implements PullRequestChangeData
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
index cc004b1a3a..9e79d5c634 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
@@ -4,6 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -49,13 +51,14 @@ public class PullRequestSourceBranchRestoreData implements PullRequestChangeData
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
index 659dcd7d9f..c2e42fa3a3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
@@ -6,6 +6,8 @@ import org.apache.wicket.Component;
import com.google.common.collect.Lists;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -35,13 +37,14 @@ public class PullRequestTitleChangeData implements PullRequestChangeData {
@Override
public Component render(String componentId, PullRequestChange change) {
+ Long changeId = change.getId();
return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
protected PullRequestChange getChange() {
- return change;
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@Override