dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20885
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-28 00:33:57 -0400
message:
  Minor
modified:
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.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-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java	2015-10-28 02:23:35 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java	2015-10-28 04:33:57 +0000
@@ -128,9 +128,11 @@
     public boolean isLdapConfigured()
     {
         String ldapUrl = getProperty( ConfigurationKey.KEY_LDAP_URL );
+        String managerDn = getProperty( ConfigurationKey.KEY_LDAP_MANAGER_DN );
         String dnPatterns = getProperty( ConfigurationKey.KEY_LDAP_DN_PATTERNS );
-                
+        
         return !( ConfigurationKey.KEY_LDAP_URL.getDefaultValue().equals( ldapUrl ) ||
+            ConfigurationKey.KEY_LDAP_MANAGER_DN.getDefaultValue().equals( managerDn ) ||
             ConfigurationKey.KEY_LDAP_DN_PATTERNS.getDefaultValue().equals( dnPatterns ) );
     }
 }