From 032d9deb8c5b2cd08cce0dd5839f041f516521b3 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 2 Jun 2011 14:30:09 +0000
Subject: [PATCH] NIHVIVO-2279 Fix null pointer exception if not logged in.

---
 .../edu/cornell/mannlib/vedit/beans/LoginStatusBean.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java b/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java
index 318089279..e9ba5640a 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java
@@ -119,8 +119,12 @@ public class LoginStatusBean {
 				.getAttribute("webappDaoFactory");
 		UserDao userDao = wadf.getUserDao();
 
-		String userUri = getBean(session).getUserURI();
-		return userDao.getUserByURI(userUri);
+		if (getBean(session).isLoggedIn()) {
+			String userUri = getBean(session).getUserURI();
+			return userDao.getUserByURI(userUri);
+		} else {
+			return null;
+		}
 	}
 
 	// ----------------------------------------------------------------------