svn commit: r682245 - in /directory/apacheds/branches/bigbang: core/src/main/java/org/apache/directory/server/core/exception/ mitosis/src/test/java/org/apache/directory/mitosis/service/

[ak...@apache.org]

Author: akarasulu
Date: Sun Aug  3 19:35:33 2008
New Revision: 682245

URL: http://svn.apache.org/viewvc?rev=682245&view=rev
Log:
fixing bug in mitosis due to shift in lookup behavior

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java
    directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=682245&r1=682244&r2=682245&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Sun Aug  3 19:35:33 2008
@@ -169,7 +169,7 @@
         {
             // We don't know if the parent is an alias or not, so we will launch a 
             // lookup, and update the cache if it's not an alias
-            ServerEntry attrs;
+            ClonedServerEntry attrs;
             
             try
             {
@@ -184,7 +184,7 @@
                 throw e2;
             }
             
-            EntryAttribute objectClass = attrs.get( SchemaConstants.OBJECT_CLASS_AT );
+            EntryAttribute objectClass = attrs.getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT );
             
             if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )
             {

Modified: directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java?rev=682245&r1=682244&r2=682245&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java Sun Aug  3 19:35:33 2008
@@ -29,6 +29,8 @@
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.interceptor.Interceptor;
 import org.apache.directory.server.core.jndi.CoreContextFactory;
+import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.After;
 import org.junit.Before;
@@ -141,7 +143,7 @@
             env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
 
             // Initialize the server instance.
-            LdapContext context = new InitialLdapContext( env, null );
+            LdapContext context = new ServerLdapContext( service, service.getAdminSession(), new LdapDN() );
             contexts.put( replicaId, context );
             services.put( replicaId, service );
             replicationServices.put( replicaId, replicationInterceptor );

Modified: directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java?rev=682245&r1=682244&r2=682245&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java Sun Aug  3 19:35:33 2008
@@ -59,7 +59,7 @@
         
         // We add the 'room' OC to have at least a STRUCTURAL OC
         entry.put( "objectClass", "top" ).add( "room" );
-        ctxA.bind( "cn=test,ou=system", null, entry );
+        ctxA.createSubcontext( "cn=test,ou=system", entry );
         
         Attributes attributes = ctxA.getAttributes( "cn=test,ou=system" );
         assertNull( attributes.get( SchemaConstants.CN_AT_OID ) );