[hornetq-commits] JBoss hornetq SVN: r11779 - in trunk: tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management and 1 other directory.

[do-not-reply at jboss.org]

Author: gaohoward
Date: 2011-11-28 07:55:00 -0500 (Mon, 28 Nov 2011)
New Revision: 11779

Modified:
   trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
Log:
Test problem
1. HornetQServerImpl is started twice in the setUp() method of the test
2. Add a check in HornetQServerImpl.start() to avoid being started twice



Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-11-28 12:48:14 UTC (rev 11778)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-11-28 12:55:00 UTC (rev 11779)
@@ -335,6 +335,13 @@
 
    public synchronized void start() throws Exception
    {
+      if (started)
+      {
+         log.debug("Server already started!");
+         return;
+      }
+      
+      log.debug("Starting server " + this);
       OperationContextImpl.clearContext();
 
       try

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java	2011-11-28 12:48:14 UTC (rev 11778)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java	2011-11-28 12:55:00 UTC (rev 11779)
@@ -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();