svn commit: r1837584 - /ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java

[pgil]

Author: pgil
Date: Tue Aug  7 09:34:53 2018
New Revision: 1837584

URL: http://svn.apache.org/viewvc?rev=1837584&view=rev
Log:
Fixed: Initial set of hasLoggedOut flag when logging in
(OFBIZ-10506)

Thanks Dennis for your patch

Modified:
    
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java

Modified: 
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java?rev=1837584&r1=1837583&r2=1837584&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
 Tue Aug  7 09:34:53 2018
@@ -189,8 +189,7 @@ public class LoginServices {
                             
"Y".equalsIgnoreCase(userLogin.getString("isSystem")) : false;
 
                     // grab the hasLoggedOut flag
-                    boolean hasLoggedOut = userLogin.get("hasLoggedOut") != 
null ?
-                            
"Y".equalsIgnoreCase(userLogin.getString("hasLoggedOut")) : false;
+                    Boolean hasLoggedOut = 
userLogin.getBoolean("hasLoggedOut");
 
                     if ((UtilValidate.isEmpty(userLogin.getString("enabled")) 
|| "Y".equals(userLogin.getString("enabled")) ||
                             (reEnableTime != null && 
reEnableTime.before(UtilDateTime.nowTimestamp())) || (isSystem)) && 
UtilValidate.isEmpty(userLogin.getString("disabledBy"))) {
@@ -228,7 +227,7 @@ public class LoginServices {
                             Debug.logVerbose("[LoginServices.userLogin] : 
Password Matched", module);
 
                             // update the hasLoggedOut flag
-                            if (hasLoggedOut) {
+                            if (hasLoggedOut == null || hasLoggedOut) {
                                 userLogin.set("hasLoggedOut", "N");
                             }
 
@@ -236,7 +235,7 @@ public class LoginServices {
                             Long currentFailedLogins = 
userLogin.getLong("successiveFailedLogins");
                             if (currentFailedLogins != null && 
currentFailedLogins > 0) {
                                 userLogin.set("successiveFailedLogins", 0L);
-                            } else if (!hasLoggedOut) {
+                            } else if (hasLoggedOut != null && !hasLoggedOut) {
                                 // successful login & no logout flag, no need 
to change anything, so don't do the store
                                 doStore = false;
                             }