Author: clebert.suconic(a)jboss.com Date: 2011-07-14 19:28:11 -0400 (Thu, 14 Jul 2011) New Revision: 10988 Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java Log: fixing test 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-07-14 18:39:50 UTC (rev 10987) +++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-07-14 23:28:11 UTC (rev 10988) @@ -1376,9 +1376,9 @@ csf = conn.tryConnect(); - if (csf != null || ServerLocatorImpl.this.closed || ServerLocatorImpl.this.closing) + if (csf != null) { - break; + return csf; } } @@ -1387,7 +1387,10 @@ break; } - Thread.sleep (retryInterval); + if (!closed && !closing) + { + Thread.sleep (retryInterval); + } } }