Author: akarasulu Date: Fri Dec 3 22:40:27 2004 New Revision: 109782 URL: http://svn.apache.org/viewcvs?view=rev&rev=109782 Log: handle generic NamingEnumeration to allow for variance instead of just using a SearchResultEnumeration Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/ibs/FilterServiceImpl.java
Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/ibs/FilterServiceImpl.java Url: http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/ibs/FilterServiceImpl.java?view=diff&rev=109782&p1=incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/ibs/FilterServiceImpl.java&r1=109781&p2=incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/ibs/FilterServiceImpl.java&r2=109782 ============================================================================== --- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/ibs/FilterServiceImpl.java (original) +++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/ibs/FilterServiceImpl.java Fri Dec 3 22:40:27 2004 @@ -23,12 +23,12 @@ import javax.naming.Name; import javax.naming.NamingException; +import javax.naming.NamingEnumeration; import javax.naming.ldap.LdapContext; import javax.naming.directory.*; import org.apache.eve.db.SearchResultFilter; import org.apache.eve.db.DbSearchResult; -import org.apache.eve.db.SearchResultEnumeration; import org.apache.eve.db.ResultFilteringEnumeration; import org.apache.eve.jndi.Invocation; import org.apache.eve.jndi.BaseInterceptor; @@ -101,10 +101,10 @@ if ( invocation.getState() == InvocationStateEnum.POSTINVOCATION ) { - SearchResultEnumeration enum ; + NamingEnumeration enum ; ResultFilteringEnumeration retval; LdapContext ctx = ( LdapContext ) invocation.getContextStack().peek(); - enum = ( SearchResultEnumeration ) invocation.getReturnValue(); + enum = ( NamingEnumeration ) invocation.getReturnValue(); retval = new ResultFilteringEnumeration( enum, LIST_CONTROLS, ctx, new SearchResultFilter() { @@ -179,10 +179,10 @@ return; } - SearchResultEnumeration enum ; + NamingEnumeration enum ; ResultFilteringEnumeration retval; LdapContext ctx = ( LdapContext ) invocation.getContextStack().peek(); - enum = ( SearchResultEnumeration ) invocation.getReturnValue(); + enum = ( NamingEnumeration ) invocation.getReturnValue(); retval = new ResultFilteringEnumeration( enum, searchControls, ctx, new SearchResultFilter() {
