svn commit: r833435 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/jmx/ManagementContext.java test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java

[gtully]

Author: gtully
Date: Fri Nov  6 15:14:05 2009
New Revision: 833435

URL: http://svn.apache.org/viewvc?rev=833435&view=rev
Log:
resolve intermittent failure of DiscoveryNetworkReconnectTest due to network timing issues

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java?rev=833435&r1=833434&r2=833435&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java Fri Nov  6 15:14:05 2009
@@ -47,7 +47,7 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * A Flow provides different dispatch policies within the NMR
+ * An abstraction over JMX mbean registration
  *
  * @org.apache.xbean.XBean
  * @version $Revision$
@@ -91,14 +91,13 @@
                 try {
                     getMBeanServer().invoke(namingServiceObjectName, "start", null, null);
                 } catch (Throwable ignore) {
-                    LOG.debug("ignored error on start invocation", ignore);
                 }
                 Thread t = new Thread("JMX connector") {
                     public void run() {
                         try {
                             JMXConnectorServer server = connectorServer;
                             if (started.get() && server != null) {
-                                LOG.debug("Starting JMX JMXConnectorServer...");
+                                LOG.debug("Starting JMXConnectorServer...");
                                 server.start();
                                 LOG.info("JMX consoles can connect to " + server.getAddress());
                             }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java?rev=833435&r1=833434&r2=833435&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java Fri Nov  6 15:14:05 2009
@@ -195,8 +195,11 @@
             // wait for the inactivity timeout and network shutdown
             assertTrue("network connector mbean unregistered within 1 minute", mbeanUnregistered.tryAcquire(60, TimeUnit.SECONDS));
             
+            // whack all connections
+            proxy.close();
+            
             // let a reconnect succeed
-            proxy.goOn();      
+            proxy.reopen();      
         }
     }
 }