svn commit: r1771517 - in /ofbiz/branches/release16.11: ./ framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java

Author: jleroux
Date: Sat Nov 26 22:33:56 2016
New Revision: 1771517

URL: http://svn.apache.org/viewvc?rev=1771517&view=rev
Log:
"Applied fix from trunk for revision: 1771516  "
------------------------------------------------------------------------
r1771516 | jleroux | 2016-11-26 23:32:42 +0100 (sam. 26 nov. 2016) | 14 lignes

Fixed: Errormessage is displayed twice in LoginEvents.java
(OFBIZ-9125)

Issue:
The errormessage "The password does not match the pattern" is called twice
in LoginServices.java.

Fix:
Delete second assignment for variable "errMsg".

jleroux: I simply removed the author commented out comment (2 lines)

Thanks: Heiko Elberg

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 26 22:33:56 2016
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448
+/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516

Modified: ofbiz/branches/release16.11/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java?rev=1771517&r1=1771516&r2=1771517&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/branches/release16.11/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java Sat Nov 26 22:33:56 2016
@@ -986,7 +986,6 @@ public class LoginServices {
                             "security.login.password.pattern.description", "loginservices.password_must_be_least_characters_long", delegator);
                     errMsg = UtilProperties.getMessage(resource, passwordPatternMessage, messageMap, locale);
                     messageMap = UtilMisc.toMap("passwordPatternMessage", errMsg);
-                    errMsg = UtilProperties.getMessage(resource,"loginservices.password.pattern.errmsg", messageMap, locale);
                     errorMessageList.add(errMsg);
                 }
             } else {