Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2E61F9E2F for ; Wed, 6 Jun 2012 16:34:01 +0000 (UTC) Received: (qmail 67804 invoked by uid 500); 6 Jun 2012 16:34:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67745 invoked by uid 500); 6 Jun 2012 16:34:01 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 67737 invoked by uid 99); 6 Jun 2012 16:34:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 16:34:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 16:33:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 96FF723889E1 for ; Wed, 6 Jun 2012 16:33:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Wed, 06 Jun 2012 16:33:39 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606163339.96FF723889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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();