Author: clebert.suconic(a)jboss.com Date: 2011-08-03 16:52:33 -0400 (Wed, 03 Aug 2011) New Revision: 11105 Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java Log: tweak Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-08-03 20:44:02 UTC (rev 11104) +++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-08-03 20:52:33 UTC (rev 11105) @@ -1598,8 +1598,12 @@ } try { - factory.connect(1, false); - return factory; + ClientSessionFactoryInternal factoryToUse = factory; + if (factoryToUse != null) + { + factory.connect(1, false); + } + return factoryToUse; } catch (HornetQException e) {