dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21889
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-02-05 14:09:44 +0700
message:
  minor fix
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	2016-01-05 17:37:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2016-02-05 07:09:44 +0000
@@ -34,7 +34,6 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DimensionType;
 import org.hisp.dhis.common.DimensionalObject;
@@ -274,7 +273,7 @@
 
         return dataSets;
     }
-    
+
     /**
      * Returns a set of the programs for all user authority groups
      * of this user credentials.
@@ -290,10 +289,10 @@
 
         return programs;
     }
-    
+
     /**
      * Indicates if the given program is accessible.
-     * 
+     *
      * @param program the program.
      * @return true if if the given program is accessible.
      */
@@ -306,7 +305,7 @@
                 return true;
             }
         }
-        
+
         return false;
     }
 
@@ -785,11 +784,13 @@
             {
                 openId = userCredentials.getOpenId();
                 ldapId = userCredentials.getLdapId();
+                userInfo = userCredentials.getUserInfo();
             }
             else if ( strategy.isMerge() )
             {
                 openId = userCredentials.getOpenId() == null ? openId : userCredentials.getOpenId();
                 ldapId = userCredentials.getLdapId() == null ? ldapId : userCredentials.getLdapId();
+                userInfo = userCredentials.getUserInfo() == null ? userInfo : userCredentials.getUserInfo();
             }
 
             userAuthorityGroups.clear();