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

fix NPE

Browse Source
This commit is contained in:
Athou
2013-05-12 16:54:35 +02:00
parent 73154be1db
commit 5727a01481
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/commafeed/frontend/pages/BasePage.java
View File

@@ -73,12 +73,14 @@ public abstract class BasePage extends WebPage {
User user = CommaFeedSession.get().getUser(); User user = CommaFeedSession.get().getUser();
if (user != null) { if (user != null) {
UserSettings settings = userSettingsDAO.findByUser(user); UserSettings settings = userSettingsDAO.findByUser(user);
lang = settings.getLanguage() == null ? "en" : settings if (settings != null) {
.getLanguage(); lang = settings.getLanguage() == null ? "en" : settings
.getLanguage();
}
} }
add(new TransparentWebMarkupContainer("html").add(new AttributeModifier("lang", add(new TransparentWebMarkupContainer("html")
lang))); .add(new AttributeModifier("lang", lang)));
settings = applicationSettingsService.get(); settings = applicationSettingsService.get();
add(new HeaderResponseContainer("footer-container", "footer-container")); add(new HeaderResponseContainer("footer-container", "footer-container"));