Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE

Browse Source
This commit is contained in:
Athou
2013-03-22 23:15:20 +01:00
parent 8b1022a4e1
commit 9326190a1f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/frontend/rest/FeedEntriesREST.java
View File

@@ -62,8 +62,8 @@ public class FeedEntriesREST extends JSONPage {
entries.getEntries().addAll(buildEntries(subscription)); entries.getEntries().addAll(buildEntries(subscription));
} else { } else {
FeedCategory feedCategory = feedCategoryService.findById("all" FeedCategory feedCategory = "all".equals(id) ? null
.equals(id) ? null : Long.valueOf(id)); : feedCategoryService.findById(Long.valueOf(id));
Collection<FeedSubscription> subscriptions = "all".equals(id) ? feedSubscriptionService Collection<FeedSubscription> subscriptions = "all".equals(id) ? feedSubscriptionService
.findAll(getUser()) : feedSubscriptionService .findAll(getUser()) : feedSubscriptionService
.findWithCategory(getUser(), feedCategory); .findWithCategory(getUser(), feedCategory);

2
src/main/java/com/commafeed/model/UserSettings.java
View File

@@ -2,6 +2,7 @@ package com.commafeed.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.EnumType; import javax.persistence.EnumType;
import javax.persistence.Enumerated; import javax.persistence.Enumerated;
@@ -23,6 +24,7 @@ public class UserSettings implements Serializable {
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
private Long id; private Long id;
@Column(name = "user_id")
private User user; private User user;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)