Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAK-49341 Announcement NPE while viewing dashboard when announcements are merged from a site the user isn't a member of #11970

Merged
merged 4 commits into from
Oct 18, 2023
Merged

SAK-49341 Announcement NPE while viewing dashboard when announcements are merged from a site the user isn't a member of #11970

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b05d37
NPE viewing dashboard containing announcements merged from site user …
austin48 Oct 5, 2023
b1cfc59
SAK-49341 NPE viewing dashboard containing announcements merged from …
austin48 Oct 10, 2023
94f4edd
Update announcement/announcement-impl/impl/src/java/org/sakaiproject/…
ern Oct 11, 2023
070c507
Update announcement/announcement-impl/impl/src/java/org/sakaiproject/…
ern Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...uncement-impl/impl/src/java/org/sakaiproject/announcement/impl/DbAnnouncementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.List;
import java.util.Map;
import java.util.Stack;
import java.util.Vector;
ern marked this conversation as resolved.
Show resolved Hide resolved

import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -632,6 +633,8 @@ public Map<String, List<AnnouncementMessage>> getViewableAnnouncementsForCurrent

public List<AnnouncementMessage> getViewableAnnouncementsForSite(String channelRef, Integer maxAgeInDays) {

List<AnnouncementMessage> viewableAnnouncements = new Vector();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@austin48 a Vector probably isn't needed here unless it would be used by another thread?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although the main case for this commit is returning an empty List where there is a failure getting messages, I used a Vector because in a successful case, getMessages() (from BaseAnnouncementService) returns a Vector.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor thing, but if the variable is not going to be used elsewhere I would directly return "new Vector" at the end of the method.


try {
ViewableFilter viewableFilter = new ViewableFilter(null, null, Integer.MAX_VALUE, this);
if (maxAgeInDays != null) {
Expand All @@ -643,6 +646,6 @@ public List<AnnouncementMessage> getViewableAnnouncementsForSite(String channelR
} catch (Exception e) {
log.warn("Failed to add announcements from site {}", channelRef, e);
}
return null;
return viewableAnnouncements;
}
}
Loading