directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
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 GMT
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 );



Mime
View raw message