Merge branch 'stable'

michaelklishin · michaelklishin · commit 94146fe5b776 · 2015-12-04T00:17:51.000+03:00
diff --git a/src/com/rabbitmq/client/ConnectionFactory.java b/src/com/rabbitmq/client/ConnectionFactory.java
@@ -57,8 +57,8 @@ public class ConnectionFactory implements Cloneable {
      *  zero means no limit */
     public static final int    DEFAULT_FRAME_MAX = 0;
     /** Default heart-beat interval;
-     *  zero means no heart-beats */
-    public static final int    DEFAULT_HEARTBEAT = 0;
+     *  60 seconds */
+    public static final int    DEFAULT_HEARTBEAT = 60;
     /** The default host */
     public static final String DEFAULT_HOST = "localhost";
     /** 'Use the default port' port */
