svn commit: r928037 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java

Author: jleroux
Date: Fri Mar 26 20:05:54 2010
New Revision: 928037

URL: http://svn.apache.org/viewvc?rev=928037&view=rev
Log:
A patch from Stefan Roggensack "LoginWorker.doBasicLogout does not check userLogin against null" (https://issues.apache.org/jira/browse/OFBIZ-3577) - OFBIZ-3577

Not easy to reproduce...

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=928037&r1=928036&r2=928037&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Fri Mar 26 20:05:54 2010
@@ -586,7 +586,9 @@ public class LoginWorker {
         }
 
         // set the logged out flag
-        LoginWorker.setLoggedOut(userLogin.getString("userLoginId"), delegator);
+        if (userLogin != null) {
+            LoginWorker.setLoggedOut(userLogin.getString("userLoginId"), delegator);
+        }
 
         // this is a setting we don't want to lose, although it would be good to have a more general solution here...
         String currCatalog = (String) session.getAttribute("CURRENT_CATALOG_ID");