From 2f34ff8a9fa47441a9a81ceba47979e55d4f8a42 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 16 Sep 2013 07:01:47 +0200 Subject: [PATCH] prevent NPE if session does not exist --- src/main/java/com/commafeed/frontend/pages/HomePage.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/commafeed/frontend/pages/HomePage.java b/src/main/java/com/commafeed/frontend/pages/HomePage.java index 17c801ac..165cc612 100644 --- a/src/main/java/com/commafeed/frontend/pages/HomePage.java +++ b/src/main/java/com/commafeed/frontend/pages/HomePage.java @@ -4,6 +4,7 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.request.mapper.parameter.PageParameters; +import com.commafeed.backend.model.User; import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.model.UserSettings; import com.commafeed.frontend.CommaFeedSession; @@ -21,7 +22,11 @@ public class HomePage extends BasePage { response.render(CssHeaderItem.forReference(new UserCustomCssReference() { @Override protected String getCss() { - UserSettings settings = userSettingsDAO.findByUser(CommaFeedSession.get().getUser()); + User user = CommaFeedSession.get().getUser(); + if (user == null) { + return null; + } + UserSettings settings = userSettingsDAO.findByUser(user); return settings == null ? null : settings.getCustomCss(); } }, new PageParameters().add("_t", System.currentTimeMillis()), null));