Merge pull request rabbitmq#97 from rabbitmq/rabbitmq-java-client-57

michaelklishin · michaelklishin · commit 423a760570ab · 2015-09-24T06:05:53.000-07:00
Make sure missed heartbeats trigger connection recovery
diff --git a/.gitignore b/.gitignore
@@ -12,8 +12,9 @@
 /.idea/
 /build/
 /cover/
+/debug/
 /dist/
 /ebin/
 /out/
 /tmp/
-junit*.properties
+junit*.properties
diff --git a/src/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -5,6 +5,7 @@
 import com.rabbitmq.client.BlockedListener;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.MissedHeartbeatException;
 import com.rabbitmq.client.Recoverable;
 import com.rabbitmq.client.RecoveryListener;
 import com.rabbitmq.client.ShutdownListener;
@@ -378,7 +379,7 @@ private void addAutomaticRecoveryListener() {
         ShutdownListener automaticRecoveryListener = new ShutdownListener() {
             public void shutdownCompleted(ShutdownSignalException cause) {
                 try {
-                    if (!cause.isInitiatedByApplication()) {
+                    if (shouldTriggerConnectionRecovery(cause)) {
                         c.beginAutomaticRecovery();
                     }
                 } catch (Exception e) {
@@ -394,6 +395,10 @@ public void shutdownCompleted(ShutdownSignalException cause) {
         }
     }
 
+    protected boolean shouldTriggerConnectionRecovery(ShutdownSignalException cause) {
+        return !cause.isInitiatedByApplication() || (cause.getCause() instanceof MissedHeartbeatException);
+    }
+
     /**
      * Not part of the public API. Mean to be used by JVM RabbitMQ clients that build on
      * top of the Java client and need to be notified when server-named queue name changes
