Author: ataylor Date: 2011-10-14 03:07:12 -0400 (Fri, 14 Oct 2011) New Revision: 11535 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java Log: check for null on cc for backup server locator but remember to create it first Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-10-13 17:29:08 UTC (rev 11534) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-10-14 07:07:12 UTC (rev 11535) @@ -241,9 +241,10 @@ clusterConnector = new StaticClusterConnector(tcConfigs); + backupServerLocator = clusterConnector.createServerLocator(false); + if (backupServerLocator != null) { - backupServerLocator = clusterConnector.createServerLocator(false); backupServerLocator.setReconnectAttempts(-1); backupServerLocator.setInitialConnectAttempts(-1); } @@ -347,9 +348,10 @@ clusterConnector = new DiscoveryClusterConnector(dg); + backupServerLocator = clusterConnector.createServerLocator(false); + if (backupServerLocator != null) { - backupServerLocator = clusterConnector.createServerLocator(false); backupServerLocator.setReconnectAttempts(-1); backupServerLocator.setInitialConnectAttempts(-1); }