You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/07/27 19:13:38 UTC

svn commit: r1692913 - in /directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io: api/DirectoryApiConnectionWrapper.java jndi/JNDIConnectionWrapper.java

Author: elecharny
Date: Mon Jul 27 17:13:38 2015
New Revision: 1692913

URL: http://svn.apache.org/r1692913
Log:
o Removed useless checked on x != null when && ( x instanceof X )

Modified:
    directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
    directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java

Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1692913&r1=1692912&r2=1692913&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Mon Jul 27 17:13:38 2015
@@ -1107,9 +1107,7 @@ public class DirectoryApiConnectionWrapp
             runAndMonitor( runnable, monitor );
 
             // check reconnection
-            if ( i == 0
-                && runnable.getException() != null
-                && ( ( runnable.getException() instanceof InvalidConnectionException ) ) )
+            if ( ( i == 0 ) && ( ( runnable.getException() instanceof InvalidConnectionException ) ) )
             {
                 doConnect( monitor );
                 doBind( monitor );

Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=1692913&r1=1692912&r2=1692913&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Mon Jul 27 17:13:38 2015
@@ -1238,7 +1238,6 @@ public class JNDIConnectionWrapper imple
 
             // check reconnection
             if ( i == 0
-                && runnable.getException() != null
                 && ( ( runnable.getException() instanceof CommunicationException )
                     || ( runnable.getException() instanceof ServiceUnavailableException ) || ( runnable.getException() instanceof InsufficientResourcesException ) ) )
             {