svn commit: r1023570 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java

[ka...@apache.org]

Author: kayyagari
Date: Sun Oct 17 19:57:50 2010
New Revision: 1023570

URL: http://svn.apache.org/viewvc?rev=1023570&view=rev
Log:
o fixed some irrelevant null check and updated the log statement
o removed an unused import

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=1023570&r1=1023569&r2=1023570&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 Sun Oct 17 19:57:50 2010
@@ -33,7 +33,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.directory.ldap.client.api.ConnectionClosedEventListener;
-import org.apache.directory.ldap.client.api.NoVerificationTrustManager;
 import org.apache.directory.ldap.client.api.LdapNetworkConnection;
 import org.apache.directory.ldap.client.api.future.SearchFuture;
 import org.apache.directory.server.core.CoreSession;
@@ -231,19 +230,12 @@ public class SyncReplConsumer implements
             // Do a bind
             BindResponse bindResponse = connection.bind( config.getReplUserDn(), config.getReplUserPassword() );
 
-            // Check that it is not null and valid
-            if ( bindResponse == null )
-            {
-                LOG.error( "Failed to bind with the given bindDN and credentials" );
-                return false;
-            }
-
             // Now get the result
             LdapResult ldapResult = bindResponse.getLdapResult();
 
             if ( ldapResult.getResultCode() != ResultCodeEnum.SUCCESS )
             {
-                LOG.warn( "Failed to bind on the server : {}", ldapResult );
+                LOG.warn( "Failed to bind to the server with the given bind DN {} and credentials: {}", config.getReplUserDn(), ldapResult );
             }
             else
             {