activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r905442 - in /activemq/branches/activemq-5.3/activemq-core/src: main/java/org/apache/activemq/broker/jmx/ManagementContext.java test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
Date Mon, 01 Feb 2010 23:08:00 GMT
Author: gtully
Date: Mon Feb  1 23:08:00 2010
New Revision: 905442

URL: http://svn.apache.org/viewvc?rev=905442&view=rev
Log:
merge -c 833435 https://svn.apache.org/repos/asf/activemq/trunk - resolve intermittent failure
of DiscoveryNetworkReconnectTest due to network timing issues

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

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java?rev=905442&r1=905441&r2=905442&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
(original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
Mon Feb  1 23:08:00 2010
@@ -45,7 +45,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$
@@ -96,11 +96,12 @@
                         try {
                             JMXConnectorServer server = connectorServer;
                             if (started.get() && server != null) {
+                                LOG.debug("Starting JMXConnectorServer...");
                                 connectorStarting.set(true);
                                 try {
-                                	server.start();
+                                    server.start();
                                 } finally {
-                                	connectorStarting.set(false);
+                                    connectorStarting.set(false);
                                 }
                                 LOG.info("JMX consoles can connect to " + server.getAddress());
                             }

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java?rev=905442&r1=905441&r2=905442&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
(original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
Mon Feb  1 23:08:00 2010
@@ -202,8 +202,11 @@
             // wait for the inactivity timeout and network shutdown
             assertTrue("network connector mbean unregistered within 3 minute", mbeanUnregistered.tryAcquire(180,
TimeUnit.SECONDS));
             
+            // whack all connections
+            proxy.close();
+            
             // let a reconnect succeed
-            proxy.goOn();       
+            proxy.reopen();       
         }
     }
 }



Mime
View raw message