Merge bug14587 again

Simon MacMullen · Simon MacMullen · commit f19e850541cf · 2014-02-26T12:29:01.000Z
diff --git a/test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java
@@ -420,9 +420,9 @@ private AutorecoveringConnection newRecoveringConnection(boolean disableTopology
     private ConnectionFactory buildConnectionFactoryWithRecoveryEnabled(boolean disableTopologyRecovery) {
         ConnectionFactory cf = new ConnectionFactory();
         cf.setNetworkRecoveryInterval(RECOVERY_INTERVAL);
-        cf.setAutomaticRecovery(true);
+        cf.setAutomaticRecoveryEnabled(true);
         if (disableTopologyRecovery) {
-            cf.setTopologyRecovery(false);
+            cf.setTopologyRecoveryEnabled(false);
         }
         return cf;
     }

Original file line number	Diff line number	Diff line change
`@@ -420,9 +420,9 @@ private AutorecoveringConnection newRecoveringConnection(boolean disableTopology`
`420`	`420`	`private ConnectionFactory buildConnectionFactoryWithRecoveryEnabled(boolean disableTopologyRecovery) {`
`421`	`421`	`ConnectionFactory cf = new ConnectionFactory();`
`422`	`422`	`cf.setNetworkRecoveryInterval(RECOVERY_INTERVAL);`
`423`		`- cf.setAutomaticRecovery(true);`
	`423`	`+ cf.setAutomaticRecoveryEnabled(true);`
`424`	`424`	`if (disableTopologyRecovery) {`
`425`		`- cf.setTopologyRecovery(false);`
	`425`	`+ cf.setTopologyRecoveryEnabled(false);`
`426`	`426`	`}`
`427`	`427`	`return cf;`
`428`	`428`	`}`