Commit da0b49de authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

Restructured enterprise tabs a bit.

Fixed reference to non-existant i18n tag.
Minor tweaks for LDAP group manager and aequence manager.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9859 b35dd754-fafc-0310-a699-88a17e54d16e
parent ecdf85ea
...@@ -261,7 +261,7 @@ public class SequenceManager { ...@@ -261,7 +261,7 @@ public class SequenceManager {
pstmt.execute(); pstmt.execute();
} }
finally { finally {
DbConnectionManager.closeConnection(pstmt, null); DbConnectionManager.closeStatement(pstmt);
} }
} }
} }
\ No newline at end of file
...@@ -669,7 +669,7 @@ public class LdapGroupProvider implements GroupProvider { ...@@ -669,7 +669,7 @@ public class LdapGroupProvider implements GroupProvider {
String userDNPart = ldapName.get(ldapName.size() - 1); String userDNPart = ldapName.get(ldapName.size() - 1);
NamingEnumeration usrAnswer = ctx.search("", NamingEnumeration usrAnswer = ctx.search("",
userDNPart, searchControls); userDNPart, searchControls);
if (usrAnswer.hasMoreElements()) { if (usrAnswer != null && usrAnswer.hasMoreElements()) {
username = (String) ((SearchResult) usrAnswer.next()) username = (String) ((SearchResult) usrAnswer.next())
.getAttributes().get( .getAttributes().get(
manager.getUsernameField()).get(); manager.getUsernameField()).get();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment