directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1164188 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
Date Thu, 01 Sep 2011 18:05:03 GMT
Author: elecharny
Date: Thu Sep  1 18:05:03 2011
New Revision: 1164188

URL: http://svn.apache.org/viewvc?rev=1164188&view=rev
Log:
Fixed a nasty bug : the moveAndRenameContext.getEntry() always returns null, when we should
get back the original entry.

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1164188&r1=1164187&r2=1164188&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
Thu Sep  1 18:05:03 2011
@@ -313,7 +313,7 @@ public class ReferralInterceptor extends
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext
) throws LdapException
     {
         // Check if the entry is a referral itself
-        boolean isReferral = isReferral( moveAndRenameContext.getEntry() );
+        boolean isReferral = isReferral( moveAndRenameContext.getOriginalEntry() );
 
         next.moveAndRename( moveAndRenameContext );
 
@@ -325,7 +325,7 @@ public class ReferralInterceptor extends
             referralManager.lockWrite();
 
             referralManager.addReferral( newEntry );
-            referralManager.removeReferral( moveAndRenameContext.getEntry() );
+            referralManager.removeReferral( moveAndRenameContext.getOriginalEntry() );
 
             referralManager.unlock();
         }
@@ -338,7 +338,7 @@ public class ReferralInterceptor extends
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws
LdapException
     {
         // Check if the entry is a referral itself
-        boolean isReferral = isReferral( renameContext.getEntry() );
+        boolean isReferral = isReferral( renameContext.getOriginalEntry() );
 
         next.rename( renameContext );
 



Mime
View raw message