Author: ataylor Date: 2011-07-08 07:06:04 -0400 (Fri, 08 Jul 2011) New Revision: 10958 Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java Log: handled close on backup activation Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-08 10:36:02 UTC (rev 10957) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-07-08 11:06:04 UTC (rev 10958) @@ -583,6 +583,28 @@ public void close(final boolean permanently) throws Exception { + if (configuration.isBackup()) + { + long timeout = 30000; + + long start = System.currentTimeMillis(); + + while (backupActivationThread.isAlive() && System.currentTimeMillis() - start < timeout) + { + nodeManager.interrupt(); + + backupActivationThread.interrupt(); + + Thread.sleep(1000); + } + + if (System.currentTimeMillis() - start >= timeout) + { + log.warn("Timed out waiting for backup activation to exit"); + } + + nodeManager.stopBackup(); + } } }