directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1133073 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
Date Tue, 07 Jun 2011 16:16:47 GMT
Author: kayyagari
Date: Tue Jun  7 16:16:46 2011
New Revision: 1133073

URL: http://svn.apache.org/viewvc?rev=1133073&view=rev
Log:
o updated a log message
o fixed an NPE

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=1133073&r1=1133072&r2=1133073&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
Tue Jun  7 16:16:46 2011
@@ -218,7 +218,8 @@ public class SyncReplConsumer implements
             }
             catch ( LdapException le )
             {
-                LOG.warn( "Failed to bind to the server with the given bind Dn {} and credentials:
{}", config.getReplUserDn(), le.getCause() );
+                LOG.warn( "Failed to bind to the server with the given bind Dn {}", config.getReplUserDn()
);
+                LOG.warn( "", le );
             }
         }
         catch ( Exception e )
@@ -266,7 +267,7 @@ public class SyncReplConsumer implements
 
         SyncDoneValue ctrl = (SyncDoneValue)searchDone.getControls().get( SyncDoneValue.OID
);
 
-        if ( ctrl.getCookie() != null )
+        if ( ( ctrl != null ) && ( ctrl.getCookie() != null ) )
         {
             syncCookie = ctrl.getCookie();
             LOG.debug( "assigning cookie from sync done value control: " + Strings.utf8ToString(syncCookie)
);



Mime
View raw message