directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1056529 - /directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Date Fri, 07 Jan 2011 21:58:19 GMT
Author: elecharny
Date: Fri Jan  7 21:58:18 2011
New Revision: 1056529

URL: http://svn.apache.org/viewvc?rev=1056529&view=rev
Log:
Fixed a pb when an IAP is added, the ref UUID weren't correctly added

Modified:
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1056529&r1=1056528&r2=1056529&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Fri Jan  7 21:58:18 2011
@@ -766,6 +766,7 @@ public class SubentryInterceptor extends
             boolean sapFound = false;
             boolean seqNumberUpdated = false;
             List<String> subentryUuids = null;
+            long initialSeqNumber = entrySeqNumber;
 
             do
             {
@@ -774,12 +775,17 @@ public class SubentryInterceptor extends
                     sapFound = true;
                 }
                 
+                // We update the seqNumber only if it's below the AdminPoint seqNumber
+                // We update the UUID ref only if the initial seqNumber is below the AdminPoint
                 if ( entrySeqNumber < adminPoint.getSeqNumber() )
                 {
                     seqNumberUpdated = true;
                     subentryUuids = new ArrayList<String>();
                     entrySeqNumber = adminPoint.getSeqNumber();
+                }
 
+                if ( initialSeqNumber < adminPoint.getSeqNumber() )
+                {
                     // Evaluate the current AP on the entry for each subentry
                     for ( Subentry subentry : adminPoint.getSubentries() )
                     {



Mime
View raw message