Set shutdown executor properly with auto-recovery

References #194

Author: acogoluegnes

src/main/java/com/rabbitmq/client/impl/AMQConnection.java

@@ -397,11 +397,15 @@ public void start()
 
     protected ChannelManager instantiateChannelManager(int channelMax, ThreadFactory threadFactory) {
         ChannelManager result = new ChannelManager(this._workService, channelMax, threadFactory, this.metricsCollector);
-        result.setShutdownExecutor(this.shutdownExecutor);
-        result.setChannelShutdownTimeout((int) ((requestedHeartbeat * CHANNEL_SHUTDOWN_TIMEOUT_MULTIPLIER) * 1000));
+        configureChannelManager(result);
         return result;
     }
 
+    protected void configureChannelManager(ChannelManager channelManager) {
+        channelManager.setShutdownExecutor(this.shutdownExecutor);
+        channelManager.setChannelShutdownTimeout((int) ((requestedHeartbeat * CHANNEL_SHUTDOWN_TIMEOUT_MULTIPLIER) * 1000));
+    }
+
     /**
      * Package private API, allows for easier testing.
      */

src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnection.java

@@ -38,6 +38,9 @@ public RecoveryAwareAMQConnection(ConnectionParams params, FrameHandler handler)
 
     @Override
     protected RecoveryAwareChannelManager instantiateChannelManager(int channelMax, ThreadFactory threadFactory) {
-        return new RecoveryAwareChannelManager(super._workService, channelMax, threadFactory, this.metricsCollector);
+        RecoveryAwareChannelManager recoveryAwareChannelManager = new RecoveryAwareChannelManager(super._workService, channelMax, threadFactory,
+            this.metricsCollector);
+        configureChannelManager(recoveryAwareChannelManager);
+        return recoveryAwareChannelManager;
     }
 }