svn commit: r1346973 - in /directory/apacheds/branches/apacheds-txns-merge: protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ server-integ/src/test/java/org/apache/directory/server/replication/

[el...@apache.org]

Author: elecharny
Date: Wed Jun  6 16:33:39 2012
New Revision: 1346973

URL: http://svn.apache.org/viewvc?rev=1346973&view=rev
Log:
Applied rev 1301411

Modified:
    directory/apacheds/branches/apacheds-txns-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
    directory/apacheds/branches/apacheds-txns-merge/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java

Modified: directory/apacheds/branches/apacheds-txns-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1346973&r1=1346972&r2=1346973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (original)
+++ directory/apacheds/branches/apacheds-txns-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Wed Jun  6 16:33:39 2012
@@ -129,13 +129,13 @@ public class ReplicationConsumerImpl imp
     /** attributes on which modification should be ignored */
     private static final String[] MOD_IGNORE_AT = new String[]
         {
-            SchemaConstants.ENTRY_UUID_AT, 
-            SchemaConstants.ENTRY_CSN_AT, 
+            SchemaConstants.ENTRY_UUID_AT,
+            SchemaConstants.ENTRY_CSN_AT,
             SchemaConstants.MODIFIERS_NAME_AT,
-            SchemaConstants.MODIFY_TIMESTAMP_AT, 
-            SchemaConstants.CREATE_TIMESTAMP_AT, 
-            SchemaConstants.CREATORS_NAME_AT, 
-            SchemaConstants.ENTRY_PARENT_ID_AT 
+            SchemaConstants.MODIFY_TIMESTAMP_AT,
+            SchemaConstants.CREATE_TIMESTAMP_AT,
+            SchemaConstants.CREATORS_NAME_AT,
+            SchemaConstants.ENTRY_PARENT_ID_AT
         };
 
     /** A thread used to refresh in refreshOnly mode */
@@ -207,7 +207,7 @@ public class ReplicationConsumerImpl imp
      * Connect to the remote server. Note that a SyncRepl consumer will be connected to only
      * one remote server
      * 
-     * @return true if the connections have been successful. 
+     * @return true if the connections have been successful.
      */
     public boolean connect()
     {
@@ -277,7 +277,7 @@ public class ReplicationConsumerImpl imp
 
         if ( !config.isChaseReferrals() )
         {
-            searchRequest.addControl( new ManageDsaITDecorator( directoryService.getLdapCodecService(), 
+            searchRequest.addControl( new ManageDsaITDecorator( directoryService.getLdapCodecService(),
                 new ManageDsaITImpl() ) );
         }
     }
@@ -518,7 +518,7 @@ public class ReplicationConsumerImpl imp
     }
 
 
-    /** 
+    /**
      * {@inheritDoc}
      */
     public void setConfig( ReplicationConsumerConfig config )
@@ -903,7 +903,7 @@ public class ReplicationConsumerImpl imp
             }
 
             // Check if the OldRdn has been deleted
-            boolean deleteOldRdn = remoteEntry.contains( localRdn.getNormType(), localRdn.getNormValue() );
+            boolean deleteOldRdn = !remoteEntry.contains( localRdn.getNormType(), localRdn.getNormValue() );
 
             switch ( modDnType )
             {

Modified: directory/apacheds/branches/apacheds-txns-merge/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns-merge/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java?rev=1346973&r1=1346972&r2=1346973&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns-merge/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java (original)
+++ directory/apacheds/branches/apacheds-txns-merge/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java Wed Jun  6 16:33:39 2012
@@ -242,7 +242,6 @@ public class ClientServerReplicationIT
     
     
     @Test
-    @Ignore("There might be a bug where the old RDN value is still present in the provider session.")
     public void testModDn() throws Exception
     {
         Entry provUser = createEntry();