garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

Merge pull request #411 from MageFroh/null-ptr-fix

Browse Source 
Fix null ptr exception in feed/get/{id} rest call when all entries are read
This commit is contained in:
Athou
2013-07-09 21:12:58 -07:00
parent 5a27d65eb5 7ace9c46da
commit f23a44a07e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -308,6 +308,9 @@ public class FeedREST extends AbstractResourceREST {
return Response.status(Status.NOT_FOUND).build(); return Response.status(Status.NOT_FOUND).build();
} }
Long unreadCount = feedSubscriptionService.getUnreadCount(getUser()).get(id); Long unreadCount = feedSubscriptionService.getUnreadCount(getUser()).get(id);
if (unreadCount == null) {
unreadCount = new Long(0);
}
return Response.ok( return Response.ok(
Subscription.build(sub, applicationSettingsService.get() Subscription.build(sub, applicationSettingsService.get()
.getPublicUrl(), unreadCount)).build(); .getPublicUrl(), unreadCount)).build();