Skip to content

Commit 6178d27

Browse files
committed
fix npe
1 parent db48d82 commit 6178d27

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

src/main/java/com/cronos/onlinereview/util/PhasesDetailsServices.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,22 +1139,24 @@ private static void serviceIterativeReviewsAppFunc(HttpServletRequest request, P
11391139
throw new BaseException("Unable to find the Submitter resource "
11401140
+ "associated with the current user for project " + project.getId());
11411141
}
1142-
1143-
Submission[] mySubmissions = ActionsHelper.getResourceSubmissions(myResource.getId(),
1144-
Constants.CONTEST_SUBMISSION_TYPE_NAME, null, false);
1145-
if (mySubmissions != null) {
1146-
for (Submission submission : mySubmissions) {
1147-
if (submission.getId() == associatedSubmission.getId()) {
1148-
phaseGroup.setIterativeReviewSubmission(associatedSubmission);
1142+
if (associatedSubmission != null) {
1143+
Submission[] mySubmissions = ActionsHelper.getResourceSubmissions(myResource.getId(),
1144+
Constants.CONTEST_SUBMISSION_TYPE_NAME, null, false);
1145+
if (mySubmissions != null) {
1146+
for (Submission submission : mySubmissions) {
1147+
if (submission.getId() == associatedSubmission.getId()) {
1148+
phaseGroup.setIterativeReviewSubmission(associatedSubmission);
1149+
}
11491150
}
11501151
}
11511152
}
11521153
}
1153-
1154-
for (Resource resource : allProjectResources) {
1155-
if (resource.getId() == associatedSubmission.getUpload().getOwner()) {
1156-
phaseGroup.setIterativeReviewSubmitter(resource);
1157-
break;
1154+
if (associatedSubmission != null) {
1155+
for (Resource resource : allProjectResources) {
1156+
if (resource.getId() == associatedSubmission.getUpload().getOwner()) {
1157+
phaseGroup.setIterativeReviewSubmitter(resource);
1158+
break;
1159+
}
11581160
}
11591161
}
11601162

0 commit comments

Comments
 (0)