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

[doogie]

Author: doogie
Date: Mon May 13 22:31:20 2013
New Revision: 1482132

URL: http://svn.apache.org/r1482132
Log:
FEATURE: If the user gets forcibly logged out, store a message into the
request that mentions this; currently, nothing uses this, but that is
coming soon.

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=1482132&r1=1482131&r2=1482132&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 
Mon May 13 22:31:20 2013
@@ -47,6 +47,7 @@ import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.StringUtil.StringWrapper;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
@@ -226,7 +227,13 @@ public class LoginWorker {
         // user is logged in; check to see if they have globally logged out if 
not
         // check if they have permission for this login attempt; if not log 
them out
         if (userLogin != null) {
+            List<Object> errorMessageList = 
UtilGenerics.checkList(request.getAttribute("_ERROR_MESSAGE_LIST"));
             if (!hasBasePermission(userLogin, request) || 
isFlaggedLoggedOut(userLogin)) {
+                if (errorMessageList == null) {
+                    errorMessageList = new FastList<Object>();
+                    request.setAttribute("_ERROR_MESSAGE_LIST", 
errorMessageList);
+                }
+                errorMessageList.add("User does not have permission or is 
flagged as logged out");
                 Debug.logInfo("User does not have permission or is flagged as 
logged out", module);
                 doBasicLogout(userLogin, request, response);
                 userLogin = null;