Fix issue #202 - Exception thrown when type @ to mention user

theonedev · Aug 23, 2020 · a5c6059 · a5c6059
1 parent f7ec932
commit a5c6059
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -568,13 +568,17 @@ public Collection<User> getParticipants() {
 			UserManager userManager = OneDev.getInstance(UserManager.class);
 			for (IssueField field: getFields()) {
 				if (field.getType().equals(InputSpec.USER)) {
-					User user = userManager.findByName(field.getValue());
-					if (user != null)
-						participants.add(user);
+					if (field.getValue() != null) {
+						User user = userManager.findByName(field.getValue());
+						if (user != null)
+							participants.add(user);
+					}
 				} else if (field.getType().equals(InputSpec.GROUP)) {
-					Group group = OneDev.getInstance(GroupManager.class).find(field.getValue());
-					if (group != null)
-						participants.addAll(group.getMembers());
+					if (field.getValue() != null) {
+						Group group = OneDev.getInstance(GroupManager.class).find(field.getValue());
+						if (group != null)
+							participants.addAll(group.getMembers());
+					}
 				}
 			}
 			for (IssueComment comment: getComments()) {