directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r659381 - /directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
Date Fri, 23 May 2008 02:54:52 GMT
Author: elecharny
Date: Thu May 22 19:54:51 2008
New Revision: 659381

URL: http://svn.apache.org/viewvc?rev=659381&view=rev
Log:
Fixed a compilation error : the OpContext is not passed to the addOperation

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=659381&r1=659380&r2=659381&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
Thu May 22 19:54:51 2008
@@ -39,7 +39,6 @@
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
-import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.PartitionNexus;
@@ -211,8 +210,11 @@
      * @param entry
      * @param target
      */
-    protected void doAddOperation( AddOperationContext opCtx, LdapDN target, ServerEntry
entry ) throws Exception
+    protected void doAddOperation( LdapDN target, ServerEntry entry ) throws Exception
     {
+        // setup the op context and populate with request controls
+        AddOperationContext opCtx = new AddOperationContext( service.getRegistries(), entry
);
+
         opCtx.addRequestControls( requestControls );
 
         // execute add operation
@@ -639,10 +641,7 @@
          */
         try
         {
-            // setup the op context
-            AddOperationContext opCtx = new AddOperationContext( service.getRegistries(),
serverEntry );
-            
-            doAddOperation( opCtx, target, serverEntry );
+            doAddOperation( target, serverEntry );
         }
         catch ( Exception e )
         {
@@ -742,10 +741,7 @@
         {
             try
             {
-                // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( service.getRegistries(),
outServerEntry );
-                
-                doAddOperation( opCtx, target, outServerEntry );
+                doAddOperation( target, outServerEntry );
             }
             catch ( Exception e )
             {
@@ -758,10 +754,7 @@
         {
             try
             {
-                // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( service.getRegistries(),
( ServerEntry ) obj );
-                
-                doAddOperation( opCtx, target, ( ServerEntry ) obj );
+                doAddOperation( target, ( ServerEntry ) obj );
             }
             catch ( Exception e )
             {
@@ -799,10 +792,7 @@
             JavaLdapSupport.serialize( serverEntry, obj, registries );
             try
             {
-                // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( service.getRegistries(),
serverEntry );
-
-                doAddOperation( opCtx, target, serverEntry );
+                doAddOperation( target, serverEntry );
             }
             catch ( Exception e )
             {
@@ -826,10 +816,7 @@
             injectRdnAttributeValues( target, serverEntry );
             try
             {
-                // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( service.getRegistries(),
serverEntry );
-
-                doAddOperation( opCtx, target, serverEntry );
+                doAddOperation( target, serverEntry );
             }
             catch ( Exception e )
             {



Mime
View raw message