Only suppress error if it is different from the original one

Author: Zhen Li

driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java

@@ -31,7 +31,6 @@
 import org.neo4j.driver.internal.async.ChannelConnectorImpl;
 import org.neo4j.driver.internal.async.pool.ConnectionPoolImpl;
 import org.neo4j.driver.internal.async.pool.PoolSettings;
-import org.neo4j.driver.internal.cluster.IdentityResolver;
 import org.neo4j.driver.internal.cluster.RoutingContext;
 import org.neo4j.driver.internal.cluster.RoutingSettings;
 import org.neo4j.driver.internal.cluster.loadbalancing.LeastConnectedLoadBalancingStrategy;
@@ -66,6 +65,7 @@
 import static org.neo4j.driver.internal.metrics.InternalAbstractMetrics.DEV_NULL_METRICS;
 import static org.neo4j.driver.internal.metrics.spi.Metrics.isMetricsEnabled;
 import static org.neo4j.driver.internal.security.SecurityPlan.insecure;
+import static org.neo4j.driver.internal.util.ErrorUtil.addSuppressed;
 
 public class DriverFactory
 {
@@ -371,10 +371,7 @@ private static void closeConnectionPoolAndSuppressError( ConnectionPool connecti
         }
         catch ( Throwable closeError )
         {
-            if ( mainError != closeError )
-            {
-                mainError.addSuppressed( closeError );
-            }
+            addSuppressed( mainError, closeError );
         }
     }
 

driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java

@@ -43,6 +43,7 @@
 
 import static java.util.Collections.emptyMap;
 import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.neo4j.driver.internal.util.ErrorUtil.addSuppressed;
 import static org.neo4j.driver.internal.util.Futures.completedWithNull;
 import static org.neo4j.driver.internal.util.Futures.failedFuture;
 
@@ -403,7 +404,7 @@ private <T> void rollbackTxAfterFailedTransactionWork( ExplicitTransaction tx, C
             {
                 if ( rollbackError != null )
                 {
-                    error.addSuppressed( rollbackError );
+                    addSuppressed( error, rollbackError );
                 }
                 resultFuture.completeExceptionally( error );
             } );

driver/src/main/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcher.java

@@ -37,6 +37,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static org.neo4j.driver.internal.messaging.request.ResetMessage.RESET;
+import static org.neo4j.driver.internal.util.ErrorUtil.addSuppressed;
 
 public class InboundMessageDispatcher implements ResponseMessageHandler
 {
@@ -146,7 +147,7 @@ public void handleChannelError( Throwable error )
         if ( currentError != null )
         {
             // we already have an error, this new error probably is caused by the existing one, thus we chain the new error on this current error
-            currentError.addSuppressed( error );
+            addSuppressed( currentError, error );
         }
         else
         {

driver/src/main/java/org/neo4j/driver/internal/async/pool/NettyChannelTracker.java

@@ -62,7 +62,7 @@ public NettyChannelTracker( MetricsListener metricsListener, ChannelGroup channe
     @Override
     public void channelReleased( Channel channel )
     {
-        log.debug( "Channel [%s] released back to the pool", channel.id() );
+        log.debug( "Channel [0x%s] released back to the pool", channel.id() );
         decrementInUse( channel );
         incrementIdle( channel );
         channel.closeFuture().addListener( closeListener );

driver/src/main/java/org/neo4j/driver/internal/util/ErrorUtil.java

@@ -127,6 +127,14 @@ private static String extractClassification( String code )
         return parts[1];
     }
 
+    public static void addSuppressed( Throwable mainError, Throwable error )
+    {
+        if ( mainError != error )
+        {
+            mainError.addSuppressed( error );
+        }
+    }
+
     /**
      * Exception which is merely a holder of an async stacktrace, which is not the primary stacktrace users are interested in.
      * Used for blocking API calls that block on async API calls.

driver/src/main/java/org/neo4j/driver/internal/util/Futures.java

@@ -29,6 +29,7 @@
 import org.neo4j.driver.internal.async.EventLoopGroupFactory;
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.neo4j.driver.internal.util.ErrorUtil.addSuppressed;
 
 public final class Futures
 {
@@ -184,10 +185,7 @@ public static CompletionException combineErrors( Throwable error1, Throwable err
         {
             Throwable cause1 = completionExceptionCause( error1 );
             Throwable cause2 = completionExceptionCause( error2 );
-            if ( cause1 != cause2 )
-            {
-                cause1.addSuppressed( cause2 );
-            }
+            addSuppressed( cause1, cause2 );
             return asCompletionException( cause1 );
         }
         else if ( error1 != null )