fixed possible NPE

Erudika · Mar 18, 2020 · ef46d8d · ef46d8d
1 parent 4593594
commit ef46d8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/erudika/scoold/controllers/TagsController.java b/src/main/java/com/erudika/scoold/controllers/TagsController.java
@@ -29,6 +29,7 @@
 import com.erudika.scoold.utils.ScooldUtils;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -106,7 +107,7 @@ public String rename(@RequestParam String tag, @RequestParam String newtag, Http
 					questionslist = pc.findTagged(Utils.type(Question.class), new String[]{tagg.getTag()}, pager);
 					for (Question q : questionslist) {
 						taggedCount++;
-						q.setTags(q.getTags().stream().
+						q.setTags(Optional.ofNullable(q.getTags()).orElse(Collections.emptyList()).stream().
 								map(ts -> ts.equals(tagg.getTag()) ? t.getTag() : ts).
 								collect(Collectors.toList()));
 						logger.debug("Updated {} out of {} questions with new tag {}.",

diff --git a/src/main/java/com/erudika/scoold/utils/ScooldUtils.java b/src/main/java/com/erudika/scoold/utils/ScooldUtils.java
@@ -497,8 +497,8 @@ public void sendUpdatedFavTagsNotifications(Post question, List<String> addedTag
 			String body = Utils.markdownToHtml(question.getBody());
 			String picture = Utils.formatMessage("<img src='{0}' width='25'>", postAuthor.getPicture());
 			String postURL = getServerURL() + CONTEXT_PATH + question.getPostLink(false, false);
-			String tagsString = question.getTags().stream().map(t -> "<span class=\"tag\">" +
-					(addedTags.contains(t) ? "<b>" + t + "<b>" : t) + "</span>").
+			String tagsString = Optional.ofNullable(question.getTags()).orElse(Collections.emptyList()).stream().
+					map(t -> "<span class=\"tag\">" + (addedTags.contains(t) ? "<b>" + t + "<b>" : t) + "</span>").
 					collect(Collectors.joining("&nbsp;"));
 			model.put("logourl", Config.getConfigParam("small_logo_url", "https://scoold.com/logo.png"));
 			model.put("heading", Utils.formatMessage("{0} {1} edited:", picture, name));
@@ -525,7 +525,8 @@ public void sendNewPostNotifications(Post question) {
 			String body = Utils.markdownToHtml(question.getBody());
 			String picture = Utils.formatMessage("<img src='{0}' width='25'>", postAuthor.getPicture());
 			String postURL = getServerURL() + CONTEXT_PATH + question.getPostLink(false, false);
-			String tagsString = question.getTags().stream().map(t -> "<span class=\"tag\">" + t + "</span>").
+			String tagsString = Optional.ofNullable(question.getTags()).orElse(Collections.emptyList()).stream().
+					map(t -> "<span class=\"tag\">" + t + "</span>").
 					collect(Collectors.joining("&nbsp;"));
 			model.put("logourl", Config.getConfigParam("small_logo_url", "https://scoold.com/logo.png"));
 			model.put("heading", Utils.formatMessage("{0} {1} posted:", picture, name));