[ofbiz-framework] branch trunk updated: Improved: Removes trailing blanks found by chance, updates checkstyleMain.maxErrors

[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 c52e437  Improved: Removes trailing blanks found by chance, updates 
checkstyleMain.maxErrors
c52e437 is described below

commit c52e437eca297dda25894f4118a731d0d1afea31
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Jul 7 10:08:58 2020 +0200

    Improved: Removes trailing blanks found by chance, updates 
checkstyleMain.maxErrors
---
 build.gradle                                                          | 2 +-
 .../src/main/java/org/apache/ofbiz/common/login/LoginServices.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2578d64..160f6ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -287,7 +287,7 @@ checkstyle {
     // the sum of errors found last time it was changed after using the
     // ‘checkstyle’ tool present in the framework and in the official
     // plugins.
-    tasks.checkstyleMain.maxErrors = 26432
+    tasks.checkstyleMain.maxErrors = 26430
     // Currently there are a lot of errors so we need to temporarily
     // hide them to avoid polluting the terminal output.
     showViolations = false
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 27c293d..ef84b93 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
@@ -588,7 +588,7 @@ public class LoginServices {
                 .orderBy("-fromDate")
                 .cursorScrollInsensitive();
         Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
-        
+
         try (EntityListIterator eli = eq.queryIterator()) {
             GenericValue pwdHist;
             if ((pwdHist = eli.next()) != null) {
@@ -1041,7 +1041,7 @@ public class LoginServices {
 
         // 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 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);