From 9326190a1f8049cdd4583e72953afa1ec912bcaf Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 22 Mar 2013 23:15:20 +0100
Subject: [PATCH] fix NPE

---
 .../java/com/commafeed/frontend/rest/FeedEntriesREST.java     | 4 ++--
 src/main/java/com/commafeed/model/UserSettings.java           | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/rest/FeedEntriesREST.java b/src/main/java/com/commafeed/frontend/rest/FeedEntriesREST.java
index b8962160..526cfb6e 100644
--- a/src/main/java/com/commafeed/frontend/rest/FeedEntriesREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/FeedEntriesREST.java
@@ -62,8 +62,8 @@ public class FeedEntriesREST extends JSONPage {
 			entries.getEntries().addAll(buildEntries(subscription));
 
 		} else {
-			FeedCategory feedCategory = feedCategoryService.findById("all"
-					.equals(id) ? null : Long.valueOf(id));
+			FeedCategory feedCategory = "all".equals(id) ? null
+					: feedCategoryService.findById(Long.valueOf(id));
 			Collection<FeedSubscription> subscriptions = "all".equals(id) ? feedSubscriptionService
 					.findAll(getUser()) : feedSubscriptionService
 					.findWithCategory(getUser(), feedCategory);
diff --git a/src/main/java/com/commafeed/model/UserSettings.java b/src/main/java/com/commafeed/model/UserSettings.java
index d5172f51..68ef813f 100644
--- a/src/main/java/com/commafeed/model/UserSettings.java
+++ b/src/main/java/com/commafeed/model/UserSettings.java
@@ -2,6 +2,7 @@ package com.commafeed.model;
 
 import java.io.Serializable;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -23,6 +24,7 @@ public class UserSettings implements Serializable {
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	private Long id;
 
+	@Column(name = "user_id")
 	private User user;
 
 	@Enumerated(EnumType.STRING)