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 0C15773D2 for ; Thu, 11 Aug 2011 17:24:05 +0000 (UTC) Received: (qmail 35980 invoked by uid 500); 11 Aug 2011 17:24:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 35868 invoked by uid 500); 11 Aug 2011 17:24:04 -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 35839 invoked by uid 99); 11 Aug 2011 17:24:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 17:24:04 +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; Thu, 11 Aug 2011 17:24:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F31B123889EB for ; Thu, 11 Aug 2011 17:23:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1156689 - in /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication: ReplicaEventLogCursor.java SyncReplConsumer.java Date: Thu, 11 Aug 2011 17:23:40 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110811172340.F31B123889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Aug 11 17:23:40 2011 New Revision: 1156689 URL: http://svn.apache.org/viewvc?rev=1156689&view=rev Log: o Minor refactoring Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java?rev=1156689&r1=1156688&r2=1156689&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java Thu Aug 11 17:23:40 2011 @@ -233,5 +233,4 @@ class ReplicaEventLogCursor extends Abst { throw new UnsupportedOperationException(); } - } Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1156689&r1=1156688&r2=1156689&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Thu Aug 11 17:23:40 2011 @@ -332,7 +332,7 @@ public class SyncReplConsumer implements { case ADD: Dn remoteDn = directoryService.getDnFactory().create( remoteEntry.getDn().getName() ); - //System.out.println( " ============> ADDING " + remoteDn ); + //System.out.println( "C: ADDING " + remoteDn ); if ( !session.exists( remoteDn ) ) { @@ -352,7 +352,7 @@ public class SyncReplConsumer implements case MODIFY: LOG.debug( "modifying entry with dn {}", remoteEntry.getDn().getName() ); - //System.out.println( "C: modifying " + remoteEntry.getDn() ); + //System.out.println( "C: MODIFY " + remoteEntry.getDn() ); modify( remoteEntry ); break; @@ -365,7 +365,7 @@ public class SyncReplConsumer implements break; case DELETE: - //System.out.println( " ============> DELETING " + remoteEntry.getDn().getNormName() ); + //System.out.println( "C: DELETING " + remoteEntry.getDn().getNormName() ); LOG.debug( "deleting entry with dn {}", remoteEntry.getDn().getName() ); // incase of a MODDN operation resulting in a branch to be moved out of scope // ApacheDS replication provider sends a single delete event on the Dn of the moved branch @@ -590,6 +590,7 @@ public class SyncReplConsumer implements ResultCodeEnum resultCode = handleSearchDone( ( SearchResultDone ) resp ); LOG.debug( "sync operation returned result code {}", resultCode ); + if ( resultCode == ResultCodeEnum.NO_SUCH_OBJECT ) { // log the error and handle it appropriately @@ -603,6 +604,7 @@ public class SyncReplConsumer implements else if ( resultCode == ResultCodeEnum.E_SYNC_REFRESH_REQUIRED ) { LOG.info( "unable to perform the content synchronization cause E_SYNC_REFRESH_REQUIRED" ); + try { deleteRecursive( new Dn( config.getBaseDn() ), null );