SAK-49341 Announcement NPE while viewing dashboard when announcements…

… are merged from a site the user isn't a member of (#11970) Co-authored-by: Earle Nietzel <[email protected]> (cherry picked from commit 380c361)
sakaiproject · Oct 31, 2023 · 0624771 · 0624771
1 parent 7425328
commit 0624771
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...uncement-impl/impl/src/java/org/sakaiproject/announcement/impl/DbAnnouncementService.java b/...uncement-impl/impl/src/java/org/sakaiproject/announcement/impl/DbAnnouncementService.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
+import java.util.Collections;
 
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -643,6 +644,6 @@ public List<AnnouncementMessage> getViewableAnnouncementsForSite(String channelR
 		} catch (Exception e) {
 			log.warn("Failed to add announcements from site {}", channelRef, e);
 		}
-		return null;
+		return Collections.emptyList();
 	}
 }