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

[el...@apache.org]

Author: elecharny
Date: Mon Jan  3 11:15:42 2011
New Revision: 1054585

URL: http://svn.apache.org/viewvc?rev=1054585&view=rev
Log:
Updated the AdministrativePoint references to subentry

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=1054585&r1=1054584&r2=1054585&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 Mon Jan  3 11:15:42 2011
@@ -1817,22 +1817,28 @@ public class SubentryInterceptor extends
                 continue;
             }
             
+            AdministrativePoint adminPoint = null;
+            
             switch ( subentry.getAdministrativeRole() )
             {
                 case AccessControl :
                     newSeqNumber = new DefaultEntryAttribute( ACCESS_CONTROL_SEQ_NUMBER_AT, seqNumberStr );
+                    adminPoint = directoryService.getAccessControlAPCache().getElement( apDn );
                     break;
     
                 case CollectiveAttribute :
                     newSeqNumber = new DefaultEntryAttribute( COLLECTIVE_ATTRIBUTE_SEQ_NUMBER_AT, seqNumberStr );
+                    adminPoint = directoryService.getCollectiveAttributeAPCache().getElement( apDn );
                     break;
     
                 case SubSchema :
                     newSeqNumber = new DefaultEntryAttribute( SUB_SCHEMA_SEQ_NUMBER_AT, seqNumberStr );
+                    adminPoint = directoryService.getSubschemaAPCache().getElement( apDn );
                     break;
     
                 case TriggerExecution :
                     newSeqNumber = new DefaultEntryAttribute( TRIGGER_EXECUTION_SEQ_NUMBER_AT, seqNumberStr );
+                    adminPoint = directoryService.getTriggerExecutionAPCache().getElement( apDn );
                     break;
     
             }
@@ -1843,6 +1849,7 @@ public class SubentryInterceptor extends
             // Get back the subentry entryUUID and store it in the subentry
             String subentryUuid = entry.get( SchemaConstants.ENTRY_UUID_AT ).getString();
             subentry.setUuid( subentryUuid );
+            adminPoint.addSubentry( subentry );
         }
         
         // Inject the seqNumbers into the parent AP