Author: echatellier Date: 2014-05-30 15:52:41 +0200 (Fri, 30 May 2014) New Revision: 113 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/113 Log: Disable ldap if not configured Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-05-30 11:07:02 UTC (rev 112) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-05-30 13:52:41 UTC (rev 113) @@ -28,6 +28,7 @@ import java.util.Collection; import java.util.List; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -160,17 +161,19 @@ public List<String> getAllGroups() throws LDAPException { List<String> results = new ArrayList<>(); - // ldapsearch -h ldap.codelutin.home -b "ou=Group,DC=codelutin,DC=home" "objectClass=posixGroup" - String baseDN = "ou=Group,DC=codelutin,DC=home"; - String filter = "(objectClass=posixGroup)"; - - LDAPConnection connection = getLDAPConnection(); - if (connection.isConnected()) { - SearchResult searchResult = connection.search(baseDN, SearchScope.ONE, filter); - - List<SearchResultEntry> searchEntries = searchResult.getSearchEntries(); - for (SearchResultEntry searchEntry : searchEntries) { - results.add(searchEntry.getAttributeValue("cn")); + if (StringUtils.isNotBlank(getApplicationConfig().getLdapHost())) { + // ldapsearch -h ldap.codelutin.home -b "ou=Group,DC=codelutin,DC=home" "objectClass=posixGroup" + String baseDN = "ou=Group,DC=codelutin,DC=home"; + String filter = "(objectClass=posixGroup)"; + + LDAPConnection connection = getLDAPConnection(); + if (connection.isConnected()) { + SearchResult searchResult = connection.search(baseDN, SearchScope.ONE, filter); + + List<SearchResultEntry> searchEntries = searchResult.getSearchEntries(); + for (SearchResultEntry searchEntry : searchEntries) { + results.add(searchEntry.getAttributeValue("cn")); + } } }