Merge pull request #82 from basert/master

#75 use a connection factory with automatic recovery disabled by default

src/main/java/net/jodah/lyra/ConnectionOptions.java

@@ -33,7 +33,7 @@ public class ConnectionOptions {
   private Boolean useNio = false;
 
   public ConnectionOptions() {
-    factory = new ConnectionFactory();
+    factory = makeConnectionFactory();
   }
 
   /**
@@ -49,7 +49,7 @@ private ConnectionOptions(ConnectionOptions options) {
     nioParams = options.nioParams;
     useNio = options.useNio;
 
-    factory = new ConnectionFactory();
+    factory = makeConnectionFactory();
     factory.setAutomaticRecoveryEnabled(options.factory.isAutomaticRecoveryEnabled());
     factory.setClientProperties(options.factory.getClientProperties());
     factory.setConnectionTimeout(options.factory.getConnectionTimeout());
@@ -86,6 +86,19 @@ public ConnectionOptions copy() {
     return new ConnectionOptions(this);
   }
 
+  /**
+   * Returns a rabbitmq-java connection factory instance with automatic recovery turned off by default.
+   * This is necessary as rabbitmq-java > 4.0.0 enables it by default, resulting in two restored consumer in case of
+   * connection resets.
+   *
+   * @return a com.rabbitmq.client.ConnectionFactory with automatic recovery disabled
+   */
+  private ConnectionFactory makeConnectionFactory() {
+    ConnectionFactory factory = new ConnectionFactory();
+    factory.setAutomaticRecoveryEnabled(false);
+    return factory;
+  }
+
   /**
    * Returns the addresses to attempt connections to, in round-robin order.
    *