directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r954992 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/interceptor/ core-api/src/test/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/ core/src/main/java/or...
Date Tue, 15 Jun 2010 18:10:58 GMT
Author: elecharny
Date: Tue Jun 15 18:10:57 2010
New Revision: 954992

URL: http://svn.apache.org/viewvc?rev=954992&view=rev
Log:
Rename opContext to addContext for the add operation

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -115,9 +115,9 @@ public abstract class BaseInterceptor im
     // Interceptor's Invoke Method
     // ------------------------------------------------------------------------
 
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        next.add( opContext );
+        next.add( addContext );
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
Tue Jun 15 18:10:57 2010
@@ -146,7 +146,7 @@ public interface Interceptor
     /**
      * Filters {@link Partition#add( AddOperationContext )} call.
      */
-    void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException;
+    void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Tue Jun 15 18:10:57 2010
@@ -113,9 +113,9 @@ public class InterceptorChain
         }
 
 
-        public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+        public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
         {
-            nexus.add( opContext );
+            nexus.add( addContext );
         }
 
 
@@ -639,7 +639,7 @@ public class InterceptorChain
     }
 
 
-    public void add( AddOperationContext opContext ) throws LdapException
+    public void add( AddOperationContext addContext ) throws LdapException
     {
         Element node = getStartingEntry();
         Interceptor head = node.interceptor;
@@ -647,7 +647,7 @@ public class InterceptorChain
 
         try
         {
-            head.add( next, opContext );
+            head.add( next, addContext );
         }
         catch ( LdapException le )
         {
@@ -1008,14 +1008,14 @@ public class InterceptorChain
                 }
 
 
-                public void add( AddOperationContext opContext ) throws LdapException
+                public void add( AddOperationContext addContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
 
                     try
                     {
-                        interceptor.add( next.nextInterceptor, opContext );
+                        interceptor.add( next.nextInterceptor, addContext );
                     }
                     catch ( LdapException le )
                     {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -69,7 +69,7 @@ public interface NextInterceptor
     /**
      * Calls the next interceptor's {@link Interceptor#add( NextInterceptor, AddOperationContext
)}.
      */
-    void add( AddOperationContext opContext ) throws LdapException;
+    void add( AddOperationContext addContext ) throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -100,10 +100,10 @@ public class MockInterceptor implements 
     }
 
 
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
         interceptors.add( this );
-        next.add( opContext );
+        next.add( addContext );
     }
 
 

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=954992&r1=954991&r2=954992&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
Tue Jun 15 18:10:57 2010
@@ -215,18 +215,18 @@ public class DefaultOperationManager imp
     /**
      * {@inheritDoc}
      */
-    public void add( AddOperationContext opContext ) throws LdapException
+    public void add( AddOperationContext addContext ) throws LdapException
     {
-        LOG.debug( ">> AddOperation : {}", opContext );
-        LOG_CHANGES.debug( ">> AddOperation : {}", opContext );
+        LOG.debug( ">> AddOperation : {}", addContext );
+        LOG_CHANGES.debug( ">> AddOperation : {}", addContext );
 
         ensureStarted();
-        push( opContext );
+        push( addContext );
 
         try
         {
             // Normalize the opContext DN
-            DN dn = opContext.getDn();
+            DN dn = addContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -239,7 +239,7 @@ public class DefaultOperationManager imp
 
                 // Depending on the Context.REFERRAL property value, we will throw
                 // a different exception.
-                if ( opContext.isReferralIgnored() )
+                if ( addContext.isReferralIgnored() )
                 {
                     directoryService.getReferralManager().unlock();
 
@@ -262,7 +262,7 @@ public class DefaultOperationManager imp
 
                 // Call the Add method
                 InterceptorChain interceptorChain = directoryService.getInterceptorChain();
-                interceptorChain.add( opContext );
+                interceptorChain.add( addContext );
             }
         }
         finally

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -196,15 +196,15 @@ public class AuthenticationInterceptor e
     }
 
 
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
         if ( IS_DEBUG )
         {
-            LOG.debug( "Operation Context: {}", opContext );
+            LOG.debug( "Operation Context: {}", addContext );
         }
 
-        checkAuthenticated( opContext );
-        next.add( opContext );
+        checkAuthenticated( addContext );
+        next.add( addContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -100,16 +100,16 @@ public class ChangeLogInterceptor extend
     // -----------------------------------------------------------------------
     
 
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        next.add( opContext );
+        next.add( addContext );
 
-        if ( ! changeLog.isEnabled() || ! opContext.isFirstOperation() )
+        if ( ! changeLog.isEnabled() || ! addContext.isFirstOperation() )
         {
             return;
         }
 
-        Entry addEntry = opContext.getEntry();
+        Entry addEntry = addContext.getEntry();
 
         // we don't want to record addition of a tag as a change
         if( addEntry.get( REV_AT_OID ) != null )
@@ -119,7 +119,7 @@ public class ChangeLogInterceptor extend
         
         LdifEntry forward = new LdifEntry();
         forward.setChangeType( ChangeType.Add );
-        forward.setDn( opContext.getDn() );
+        forward.setDn( addContext.getDn() );
 
         Set<AttributeType> list = addEntry.getAttributeTypes();
         
@@ -128,8 +128,8 @@ public class ChangeLogInterceptor extend
             forward.addAttribute( addEntry.get( attributeType).clone() );
         }
         
-        LdifEntry reverse = LdifRevertor.reverseAdd( opContext.getDn() );
-        opContext.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverse ) );
+        LdifEntry reverse = LdifRevertor.reverseAdd( addContext.getDn() );
+        addContext.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverse ) );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -341,11 +341,11 @@ public class CollectiveAttributeIntercep
     // Partial Schema Checking
     // ------------------------------------------------------------------------
 
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        collectiveAttributesSchemaChecker.checkAdd( opContext.getDn(), opContext.getEntry()
);
+        collectiveAttributesSchemaChecker.checkAdd( addContext.getDn(), addContext.getEntry()
);
 
-        next.add( opContext );
+        next.add( addContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -143,10 +143,10 @@ public class EventInterceptor extends Ba
     }
 
 
-    public void add( NextInterceptor next, final AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, final AddOperationContext addContext ) throws
LdapException
     {
-        next.add( opContext );
-        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
opContext.getEntry() );
+        next.add( addContext );
+        List<RegistrationEntry> selecting = getSelectingRegistrations( addContext.getDn(),
addContext.getEntry() );
 
         if ( selecting.isEmpty() )
         {
@@ -157,7 +157,7 @@ public class EventInterceptor extends Ba
         {
             if ( EventType.isAdd( registration.getCriteria().getEventMask() ) )
             {
-                fire( opContext, EventType.ADD, registration.getListener() );
+                fire( addContext, EventType.ADD, registration.getListener() );
             }
         }
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -125,9 +125,9 @@ public class ExceptionInterceptor extend
      * In the pre-invocation state this interceptor method checks to see if the entry to
be added already exists.  If it
      * does an exception is raised.
      */
-    public void add( NextInterceptor nextInterceptor, AddOperationContext opContext ) throws
LdapException
+    public void add( NextInterceptor nextInterceptor, AddOperationContext addContext ) throws
LdapException
     {
-        DN name = opContext.getDn();
+        DN name = addContext.getDn();
 
         if ( subschemSubentryDn.getNormName().equals( name.getNormName() ) )
         {
@@ -135,7 +135,7 @@ public class ExceptionInterceptor extend
         }
 
         // check if the entry already exists
-        if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(),
name ) ) )
+        if ( nextInterceptor.hasEntry( new EntryOperationContext( addContext.getSession(),
name ) ) )
         {
             LdapEntryAlreadyExistsException ne = new LdapEntryAlreadyExistsException( 
                 I18n.err( I18n.ERR_250_ENTRY_ALREADY_EXISTS, name.getName() ) );
@@ -147,7 +147,7 @@ public class ExceptionInterceptor extend
         // we're adding the suffix entry so just ignore stuff to mess with the parent
         if ( suffix.equals( name ) )
         {
-            nextInterceptor.add( opContext );
+            nextInterceptor.add( addContext );
             return;
         }
 
@@ -170,7 +170,7 @@ public class ExceptionInterceptor extend
 
             try
             {
-                attrs = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS );
+                attrs = addContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS );
             }
             catch ( Exception e )
             {
@@ -198,7 +198,7 @@ public class ExceptionInterceptor extend
             }
         }
 
-        nextInterceptor.add( opContext );
+        nextInterceptor.add( addContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -99,7 +99,7 @@ public class JournalInterceptor extends 
     /**
      * {@inheritDoc}
      */
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
         long opRevision = 0;
         
@@ -108,11 +108,11 @@ public class JournalInterceptor extends 
             opRevision = revision.incrementAndGet();
             
             // Store the added entry
-            Entry addEntry = opContext.getEntry();
+            Entry addEntry = addContext.getEntry();
 
             LdifEntry ldif = new LdifEntry();
             ldif.setChangeType( ChangeType.Add );
-            ldif.setDn( opContext.getDn() );
+            ldif.setDn( addContext.getDn() );
 
             Set<AttributeType> list = addEntry.getAttributeTypes();
             
@@ -126,7 +126,7 @@ public class JournalInterceptor extends 
 
         try
         {
-            next.add( opContext );
+            next.add( addContext );
 
             if ( journalEnabled )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -143,10 +143,10 @@ public class TimerInterceptor implements
     /**
      * {@inheritDoc}
      */
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
         long t0 = System.nanoTime();
-        next.add( opContext );
+        next.add( addContext );
         long delta = System.nanoTime() - t0;
 
         if ( IS_DEBUG_STATS )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -110,12 +110,12 @@ public class NormalizationInterceptor ex
     /**
      * {@inheritDoc}
      */
-    public void add( NextInterceptor nextInterceptor, AddOperationContext opContext ) throws
LdapException
+    public void add( NextInterceptor nextInterceptor, AddOperationContext addContext ) throws
LdapException
     {
-        opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
-        opContext.getEntry().getDn().normalize( schemaManager.getNormalizerMapping() );
-        addRdnAttributesToEntry( opContext.getDn(), opContext.getEntry() );
-        nextInterceptor.add( opContext );
+        addContext.getDn().normalize( schemaManager.getNormalizerMapping() );
+        addContext.getEntry().getDn().normalize( schemaManager.getNormalizerMapping() );
+        addRdnAttributesToEntry( addContext.getDn(), addContext.getEntry() );
+        nextInterceptor.add( addContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=954992&r1=954991&r2=954992&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
Tue Jun 15 18:10:57 2010
@@ -165,15 +165,15 @@ public class OperationalAttributeInterce
      * - entryCSN
      * - entryUUID 
      */
-    public void add( NextInterceptor nextInterceptor, AddOperationContext opContext ) throws
LdapException
+    public void add( NextInterceptor nextInterceptor, AddOperationContext addContext ) throws
LdapException
     {
         String principal = getPrincipal().getName();
 
-        Entry entry = opContext.getEntry();
+        Entry entry = addContext.getEntry();
 
         // If we are using replication, the below four OAs may already be present and we
retain
         // those values if the user is admin.
-        boolean isAdmin = opContext.getSession().getAuthenticatedPrincipal().getName().equals(
+        boolean isAdmin = addContext.getSession().getAuthenticatedPrincipal().getName().equals(
             ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
 
         if ( entry.containsAttribute( SchemaConstants.ENTRY_UUID_AT ) )
@@ -236,7 +236,7 @@ public class OperationalAttributeInterce
             entry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
         }
 
-        nextInterceptor.add( opContext );
+        nextInterceptor.add( addContext );
     }
 
 

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=954992&r1=954991&r2=954992&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
Tue Jun 15 18:10:57 2010
@@ -229,15 +229,15 @@ public class ReferralInterceptor extends
      * entryAlreadyExists error.
      *  
      */
-    public void add( NextInterceptor next, AddOperationContext opContext ) throws LdapException
+    public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        Entry entry = opContext.getEntry();
+        Entry entry = addContext.getEntry();
 
         // Check if the entry is a referral itself
         boolean isReferral = isReferral( entry );
 
         // We add the entry into the server
-        next.add( opContext );
+        next.add( addContext );
 
         // If the addition is successful, we update the referralManager 
         if ( isReferral )



Mime
View raw message