dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21074
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-11-17 10:38:58 +0700
message:
  mergefix for userCredentials.ldapId
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2015-11-08 13:56:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2015-11-17 03:38:58 +0000
@@ -79,12 +79,12 @@
      * such as through OpenID or LDAP.
      */
     private boolean externalAuth;
-    
+
     /**
      * Unique OpenID.
      */
     private String openId;
-    
+
     /**
      * Unique LDAP distinguished name.
      */
@@ -453,7 +453,7 @@
     {
         return ldapId != null && !ldapId.isEmpty();
     }
-    
+
     /**
      * Indicates whether a password is set.
      */
@@ -461,7 +461,7 @@
     {
         return password != null;
     }
-        
+
     // -------------------------------------------------------------------------
     // hashCode and equals
     // -------------------------------------------------------------------------
@@ -747,10 +747,12 @@
             if ( strategy.isReplace() )
             {
                 openId = userCredentials.getOpenId();
+                ldapId = userCredentials.getLdapId();
             }
             else if ( strategy.isMerge() )
             {
                 openId = userCredentials.getOpenId() == null ? openId : userCredentials.getOpenId();
+                ldapId = userCredentials.getLdapId() == null ? ldapId : userCredentials.getLdapId();
             }
 
             userAuthorityGroups.clear();