calacademy-research
diff --git a/‎src/org/calacademy/antweb/util/LoginMgr.java‎
Lines changed: 3 additions & 1 deletion b/‎src/org/calacademy/antweb/util/LoginMgr.java‎
Lines changed: 3 additions & 1 deletion
@@ -105,7 +105,9 @@ public static Login getLogin(HttpServletRequest request) {
         return getAccessLogin(request);
     }
     public static Login getAccessLogin(HttpServletRequest request) {
-		return (Login) request.getSession().getAttribute("accessLogin"); 
+		HttpSession session = request.getSession();
+		if (session == null) return null;
+        return (Login) session.getAttribute("accessLogin");
     }
 
     public static void removeAccessLogin(HttpServletRequest request) {
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,9 @@ public static Login getLogin(HttpServletRequest request) {`
`105`	`105`	`return getAccessLogin(request);`
`106`	`106`	`}`
`107`	`107`	`public static Login getAccessLogin(HttpServletRequest request) {`
`108`		`- return (Login) request.getSession().getAttribute("accessLogin");`
	`108`	`+ HttpSession session = request.getSession();`
	`109`	`+ if (session == null) return null;`
	`110`	`+ return (Login) session.getAttribute("accessLogin");`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`public static void removeAccessLogin(HttpServletRequest request) {`