[hornetq-commits] JBoss hornetq SVN: r11773 - in branches/Branch_2_2_EAP: tests/src/org/hornetq/tests/integration/jms/server/management and 1 other directory.

[do-not-reply at jboss.org]

Author: gaohoward
Date: 2011-11-28 07:42:57 -0500 (Mon, 28 Nov 2011)
New Revision: 11773

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
Log:
fix test failures on Windows

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-11-28 10:32:30 UTC (rev 11772)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-11-28 12:42:57 UTC (rev 11773)
@@ -317,6 +317,12 @@
 
    public synchronized void start() throws Exception
    {
+      if (started)
+      {
+         log.debug("Server already started!");
+         return;
+      }
+
       log.debug("Starting server " + this);
       OperationContextImpl.clearContext();
 

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java	2011-11-28 10:32:30 UTC (rev 11772)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java	2011-11-28 12:42:57 UTC (rev 11773)
@@ -1177,7 +1177,6 @@
       conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
       conf.setFileDeploymentEnabled(false);
       server = HornetQServers.newHornetQServer(conf, mbeanServer, true);
-      server.start();
 
       serverManager = new JMSServerManagerImpl(server);
       context = new InVMContext();