Removed conflict with java 1.5 keyword.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 11 Mar 2004 14:52:34 +0000 (14:52 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 11 Mar 2004 14:52:34 +0000 (14:52 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@906 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/aa/attrresolv/provider/JNDIDirectoryDataConnector.java

index a5829e0..bcd99ee 100644 (file)
@@ -234,27 +234,27 @@ public class JNDIDirectoryDataConnector extends BaseDataConnector implements Dat
                InitialDirContext context = null;
                try {
                        context = new InitialDirContext(properties);
-                       NamingEnumeration enum = null;
+                       NamingEnumeration nEnumeration = null;
 
                        try {
-                               enum = context.search("", searchFilter.replaceAll("%PRINCIPAL%", principal.getName()), controls);
+                               nEnumeration = context.search("", searchFilter.replaceAll("%PRINCIPAL%", principal.getName()), controls);
                        } catch (CommunicationException e) {
                                log.debug(e);
                                log.warn(
                                        "Encountered a connection problem while querying for attributes.  Re-initializing JNDI context and retrying...");
                                context = new InitialDirContext(context.getEnvironment());
-                               enum = context.search("", searchFilter.replaceAll("%PRINCIPAL%", principal.getName()), controls);
+                               nEnumeration = context.search("", searchFilter.replaceAll("%PRINCIPAL%", principal.getName()), controls);
                        }
 
-                       if (enum == null || !enum.hasMore()) {
+                       if (nEnumeration == null || !nEnumeration.hasMore()) {
                                log.error("Could not locate a principal with the name (" + principal.getName() + ").");
                                throw new ResolutionPlugInException("No data available for this principal.");
                        }
 
-                       SearchResult result = (SearchResult) enum.next();
+                       SearchResult result = (SearchResult) nEnumeration.next();
                        Attributes attributes = result.getAttributes();
 
-                       if (enum.hasMore()) {
+                       if (nEnumeration.hasMore()) {
                                log.error("Unable to disambiguate date for principal (" + principal.getName() + ") in search.");
                                throw new ResolutionPlugInException("Cannot disambiguate data for this principal.");
                        }