directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1152183 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
Date Fri, 29 Jul 2011 12:15:57 GMT
Author: kayyagari
Date: Fri Jul 29 12:15:56 2011
New Revision: 1152183

URL: http://svn.apache.org/viewvc?rev=1152183&view=rev
Log:
o fixed the way sync info value is accessed

Modified:
    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/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=1152183&r1=1152182&r2=1152183&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
Fri Jul 29 12:15:56 2011
@@ -395,11 +395,13 @@ public class SyncReplConsumer implements
         {
             LOG.debug( "............... inside handleSyncInfo ..............." );
 
-            SyncInfoValueDecorator decorator = new SyncInfoValueDecorator( directoryService.getLdapCodecService()
);
-            byte[] syncinfo = syncInfoResp.getResponseValue();
-            decorator.setValue( syncinfo );
-            SyncInfoValue syncInfoValue = decorator.getDecorated();
+            SyncInfoValue syncInfoValue = ( SyncInfoValue ) syncInfoResp.getControl( SyncInfoValue.OID
);
 
+            if ( syncInfoValue == null )
+            {
+                return;
+            }
+            
             byte[] cookie = syncInfoValue.getCookie();
 
             if ( cookie != null )
@@ -601,7 +603,6 @@ public class SyncReplConsumer implements
                     .error(
                         "Failed to delete the replica base as part of handling E_SYNC_REFRESH_REQUIRED,
disconnecting the consumer",
                         e );
-                disconnet();
             }
 
             removeCookie();



Mime
View raw message