You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/03/20 01:29:29 UTC
svn commit: r925503 -
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
Author: elecharny
Date: Sat Mar 20 00:29:29 2010
New Revision: 925503
URL: http://svn.apache.org/viewvc?rev=925503&view=rev
Log:
Feed the LdapReferralException with the associated info
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=925503&r1=925502&r2=925503&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Sat Mar 20 00:29:29 2010
@@ -24,8 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import javax.naming.PartialResultException;
-
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -56,6 +54,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapAffectMultipleDsaException;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.exception.LdapServiceUnavailableException;
import org.apache.directory.shared.ldap.filter.SearchScope;
@@ -117,9 +116,9 @@ public class DefaultOperationManager imp
// Return with an exception
LdapReferralException lre = new LdapReferralException( urls );
- //lre.setRemainingName( childDn );
- //lre.setResolvedName( parentEntry.getDn() );
- //lre.setResolvedObj( parentEntry );
+ lre.setRemainingDn( childDn );
+ lre.setResolvedDn( parentEntry.getDn() );
+ lre.setResolvedObject( parentEntry );
return lre;
}
@@ -188,22 +187,22 @@ public class DefaultOperationManager imp
// Return with an exception
LdapReferralException lre = new LdapReferralException( urls );
- //lre.setRemainingName( childDn );
- //lre.setResolvedName( parentEntry.getDn() );
- //lre.setResolvedObj( parentEntry );
+ lre.setRemainingDn( childDn );
+ lre.setResolvedDn( parentEntry.getDn() );
+ lre.setResolvedObject( parentEntry );
return lre;
}
- private PartialResultException buildPartialResultException( DN childDn )
+ private LdapPartialResultException buildLdapPartialResultException( DN childDn )
{
- PartialResultException pre = new PartialResultException( I18n.err( I18n.ERR_315 ) );
+ LdapPartialResultException lpre = new LdapPartialResultException( I18n.err( I18n.ERR_315 ) );
- //pre.setRemainingName( childDn );
- //pre.setResolvedName( DN.EMPTY_DN );
+ lpre.setRemainingDn( childDn );
+ lpre.setResolvedDn( DN.EMPTY_DN );
- return pre;
+ return lpre;
}
@@ -238,7 +237,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else
@@ -342,7 +341,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else
@@ -423,7 +422,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else
@@ -670,7 +669,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else
@@ -753,7 +752,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else
@@ -855,7 +854,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else
@@ -969,7 +968,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else
@@ -1051,7 +1050,7 @@ public class DefaultOperationManager imp
{
directoryService.getReferralManager().unlock();
- PartialResultException exception = buildPartialResultException( childDn );
+ LdapPartialResultException exception = buildLdapPartialResultException( childDn );
throw exception;
}
else