From 38a85fcf6fe596dec055347313b0e1cd082150af Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 31 Mar 2013 14:05:17 +0200
Subject: [PATCH] prevent NPE

---
 pom.xml                                       |  2 +-
 .../frontend/rest/resources/EntriesREST.java  | 23 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 332fbfb3..24e96650 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jpa.datasource.name>java:openejb/Resource/My DataSource</jpa.datasource.name>
-		<jpa.show_sql>true</jpa.show_sql>
+		<jpa.show_sql>false</jpa.show_sql>
 	</properties>
 
 	<build>
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
index 5e608366..ffba9fe4 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
@@ -54,9 +54,11 @@ public class EntriesREST extends AbstractREST {
 		if (type == Type.feed) {
 			FeedSubscription subscription = feedSubscriptionService.findById(
 					getUser(), Long.valueOf(id));
-			entries.setName(subscription.getTitle());
-			entries.getEntries().addAll(
-					buildEntries(subscription, offset, limit, unreadOnly));
+			if (subscription != null) {
+				entries.setName(subscription.getTitle());
+				entries.getEntries().addAll(
+						buildEntries(subscription, offset, limit, unreadOnly));
+			}
 
 		} else {
 
@@ -76,13 +78,14 @@ public class EntriesREST extends AbstractREST {
 			} else {
 				FeedCategory feedCategory = feedCategoryService.findById(
 						getUser(), Long.valueOf(id));
-				List<FeedCategory> childrenCategories = feedCategoryService
-						.findAllChildrenCategories(getUser(), feedCategory);
-				entries.getEntries().addAll(
-						buildEntries(childrenCategories, subMapping, offset,
-								limit, unreadOnly));
-				entries.setName(feedCategory.getName());
-
+				if (feedCategory != null) {
+					List<FeedCategory> childrenCategories = feedCategoryService
+							.findAllChildrenCategories(getUser(), feedCategory);
+					entries.getEntries().addAll(
+							buildEntries(childrenCategories, subMapping,
+									offset, limit, unreadOnly));
+					entries.setName(feedCategory.getName());
+				}
 			}
 
 		}