[ofbiz-framework] branch trunk updated: Improved: moves a comment to its right location

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 05b62d7  Improved: moves a comment to its right location
05b62d7 is described below

commit 05b62d7476b475ce30ffaae2b8d325635b79cf0e
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Jul 6 16:10:57 2020 +0200

    Improved: moves a comment to its right location
---
 .../src/main/java/org/apache/ofbiz/common/login/LoginServices.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
 
b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
index 089e826..27c293d 100644
--- 
a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
+++ 
b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
@@ -1039,9 +1039,9 @@ public class LoginServices {
 
         String errMsg = null;
 
+        // if it's a system account (aka adminUser) don't bother checking the 
passwords
         if (!ignoreCurrentPassword) {
-            // if the password.accept.encrypted.and.plain property in security 
is set to true allow plain or encrypted passwords
-            // if this is a system account don't bother checking the passwords
+            // if the password.accept.encrypted.and.plain property in security 
is set to true allow plain or encrypted passwords            
             boolean passwordMatches = 
checkPassword(userLogin.getString("currentPassword"), useEncryption, 
currentPassword);
             if ((currentPassword == null) || (!passwordMatches)) {
                 errMsg = 
UtilProperties.getMessage(RESOURCE,"loginservices.old_password_not_correct_reenter",
 locale);