You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/06/18 09:31:54 UTC
svn commit: r669099 - in
/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context:
AbstractOperationContext.java AddOperationContext.java
Author: akarasulu
Date: Wed Jun 18 00:31:53 2008
New Revision: 669099
URL: http://svn.apache.org/viewvc?rev=669099&view=rev
Log:
fix collision between AbstractOperationContext and AddOPerationContext on entry property - there is a lot more breakage which I can fix tomorrow night
Modified:
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=669099&r1=669098&r2=669099&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Wed Jun 18 00:31:53 2008
@@ -54,7 +54,7 @@
protected LdapDN dn;
/** The entry associated with the target entry of this OperationContext */
- private ClonedServerEntry entry;
+ protected ClonedServerEntry entry;
/** The associated request's controls */
protected Map<String, Control> requestControls = new HashMap<String, Control>(4);
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=669099&r1=669098&r2=669099&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Wed Jun 18 00:31:53 2008
@@ -21,6 +21,7 @@
import org.apache.directory.server.core.CoreSession;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.shared.ldap.message.AddRequest;
@@ -37,10 +38,6 @@
*/
public class AddOperationContext extends AbstractOperationContext
{
- /** The added entry */
- private ServerEntry entry;
-
-
/**
* Creates a new instance of AddOperationContext.
*
@@ -73,7 +70,7 @@
public AddOperationContext( CoreSession session, ServerEntry entry )
{
super( session, entry.getDn() );
- this.entry = entry;
+ this.entry = new ClonedServerEntry( entry );
}
@@ -87,15 +84,15 @@
public AddOperationContext( CoreSession session, LdapDN dn, ServerEntry entry )
{
super( session, dn );
- this.entry = entry;
+ this.entry = new ClonedServerEntry( entry );
}
public AddOperationContext( CoreSession session, AddRequest addRequest ) throws Exception
{
super( session );
- this.entry = ServerEntryUtils.toServerEntry( addRequest.getAttributes(), addRequest.getEntry(),
- session.getDirectoryService().getRegistries() );
+ this.entry = new ClonedServerEntry( ServerEntryUtils.toServerEntry( addRequest.getAttributes(), addRequest.getEntry(),
+ session.getDirectoryService().getRegistries() ) );
this.dn = addRequest.getEntry();
this.requestControls = addRequest.getControls();
setReferralHandlingMode( addRequest );