[hornetq-commits] JBoss hornetq SVN: r11650 - trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-11-03 05:43:12 -0400 (Thu, 03 Nov 2011)
New Revision: 11650

Modified:
   trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
Avoid timeout exception if closed. Reduce visibility of some method and inner class.

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java	2011-11-03 01:20:57 UTC (rev 11649)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java	2011-11-03 09:43:12 UTC (rev 11650)
@@ -769,7 +769,7 @@
 
             }
 
-            if (System.currentTimeMillis() > timeout && !receivedTopology)
+            if (System.currentTimeMillis() > timeout && !receivedTopology && isInitialized())
             {
                throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT,
                                           "Timed out waiting to receive cluster topology. Group:" + discoveryGroup);
@@ -1209,7 +1209,7 @@
       doClose(true);
    }
 
-   protected void doClose(final boolean sendClose)
+   private void doClose(final boolean sendClose)
    {
       if (state == STATE.CLOSED)
       {
@@ -1417,7 +1417,6 @@
 
    private synchronized void updateArraysAndPairs()
    {
-      assertOpen();
       Collection<TopologyMember> membersCopy = topology.getMembers();
 
       topologyArray =
@@ -1521,7 +1520,7 @@
       }
    }
 
-   final class StaticConnector implements Serializable
+   private final class StaticConnector implements Serializable
    {
       private static final long serialVersionUID = 6772279632415242634l;