Author: bdaw Date: 2008-04-18 04:59:41 -0400 (Fri, 18 Apr 2008) New Revision: 10638 Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java Log: make sure to close all used NamingEnumeration objects Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2008-04-18 07:43:16 UTC (rev 10637) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2008-04-18 08:59:41 UTC (rev 10638) @@ -28,6 +28,7 @@ import org.jboss.portal.identity.Role; import javax.naming.NamingException; +import javax.naming.NamingEnumeration; import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; @@ -210,7 +211,8 @@ { LdapContext ldapContext = getConnectionContext().createInitialContext(); - + NamingEnumeration results = null; + try { SearchControls controls = new SearchControls(); @@ -236,7 +238,7 @@ if (roleCtxs.size() == 1) { - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(getRoleCtxDN(), filter, controls); @@ -256,7 +258,7 @@ for (Iterator iterator = roleCtxs.iterator(); iterator.hasNext();) { String roleCtx = (String)iterator.next(); - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(roleCtx, filter, controls); @@ -266,6 +268,7 @@ results = ldapContext.search(roleCtx, filter, filterArgs, controls); } merged.addAll(Tools.toList(results)); + results.close(); } return merged; @@ -273,6 +276,10 @@ } finally { + if (results != null) + { + results.close(); + } ldapContext.close(); } } Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-04-18 07:43:16 UTC (rev 10637) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-04-18 08:59:41 UTC (rev 10638) @@ -30,6 +30,7 @@ import javax.naming.Context; import javax.naming.NamingException; +import javax.naming.NamingEnumeration; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; @@ -155,8 +156,6 @@ filter = "*" + filter + "*"; } - Enumeration results = null; - String ldap_filter = getUserSearchFilter(); //* chars are escaped in filterArgs so we must replace it manually @@ -237,6 +236,7 @@ { LdapContext ldapContext = getConnectionContext().createInitialContext(); + NamingEnumeration results = null; try { @@ -260,7 +260,6 @@ if (userCtxs.size() == 1) { - Enumeration results = null; if (filterArgs == null) { results = ldapContext.search(getUserSearchCtxDN(), filter, controls); @@ -280,7 +279,6 @@ for (Iterator iterator = userCtxs.iterator(); iterator.hasNext();) { String userCtx = (String)iterator.next(); - Enumeration results = null; if (filterArgs == null) { results = ldapContext.search(userCtx, filter, controls); @@ -290,6 +288,7 @@ results = ldapContext.search(userCtx, filter, filterArgs, controls); } merged.addAll(Tools.toList(results)); + results.close(); } return merged; @@ -297,6 +296,10 @@ } finally { + if (results != null) + { + results.close(); + } ldapContext.close(); } } Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java 2008-04-18 07:43:16 UTC (rev 10637) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java 2008-04-18 08:59:41 UTC (rev 10638) @@ -328,7 +328,7 @@ { LdapContext ldapContext = getConnectionContext().createInitialContext(); - + NamingEnumeration results = null; try { SearchControls controls = new SearchControls(); @@ -339,7 +339,7 @@ filter = filter.replaceAll("\\\\", "\\\\\\\\"); log.debug("Search filter: " + filter); - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(getContainerDN(), filter, controls); @@ -352,6 +352,10 @@ } finally { + if (results != null) + { + results.close(); + } ldapContext.close(); } } Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-04-18 07:43:16 UTC (rev 10637) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-04-18 08:59:41 UTC (rev 10638) @@ -30,6 +30,7 @@ import javax.naming.NamingException; import javax.naming.Context; +import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttribute; @@ -394,10 +395,10 @@ log.debug("Search filter: " + filter); LdapContext ldapContext = getConnectionContext().createInitialContext(); - + NamingEnumeration results = null; try { - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(getContainerDN(), filter, controls); @@ -411,7 +412,15 @@ } finally { - ldapContext.close(); + if (results != null) + { + results.close(); + } + if (ldapContext != null) + { + ldapContext.close(); + } + } }