directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r523116 - /directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
Date Tue, 27 Mar 2007 23:45:36 GMT
Author: elecharny
Date: Tue Mar 27 16:45:35 2007
New Revision: 523116

URL: http://svn.apache.org/viewvc?view=rev&rev=523116
Log:
Fixed DIRSERVER_806 : the search decorator for referral was commented in this case, so we
didn't get a
throw when expected.

Modified:
    directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?view=diff&rev=523116&r1=523115&r2=523116
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
(original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
Tue Mar 27 16:45:35 2007
@@ -42,7 +42,9 @@
 import org.apache.directory.server.core.ServerUtils;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.enumeration.ReferralHandlingEnumeration;
 import org.apache.directory.server.core.enumeration.SearchResultFilter;
+import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.invocation.Invocation;
@@ -1023,10 +1025,10 @@
             
             if ( farthest == null )
             {
-                return next.search( base, env, filter, controls );
-                //SearchResultFilteringEnumeration srfe = ( SearchResultFilteringEnumeration
) next.search( base, env,
-                //    filter, controls );
-                //return new ReferralHandlingEnumeration( srfe, lut, attrRegistry, nexus,
controls.getSearchScope(), true );
+                //return next.search( base, env, filter, controls );
+                SearchResultFilteringEnumeration srfe = ( SearchResultFilteringEnumeration
) next.search( base, env,
+                    filter, controls );
+                return new ReferralHandlingEnumeration( srfe, lut, attrRegistry, nexus, controls.getSearchScope(),
true );
             }
 
             Attributes referral = invocation.getProxy().lookup( farthest, PartitionNexusProxy.LOOKUP_BYPASS
);



Mime
View raw message