[jboss-cvs] JBoss Messaging SVN: r8546 - in branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922: src/main/org/jboss/jms/server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jbertram
Date: 2012-07-09 20:56:49 -0400 (Mon, 09 Jul 2012)
New Revision: 8546

Modified:
   branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922/
   branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922/src/main/org/jboss/jms/server/MessagingClusterHealthMBean.java
Log:
JBPAPP-9477


Property changes on: branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/JBM1842:8169-8232
   + /branches/Branch_1_4:8481
/branches/JBM1842:8169-8232

Modified: branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922/src/main/org/jboss/jms/server/MessagingClusterHealthMBean.java
===================================================================
--- branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922/src/main/org/jboss/jms/server/MessagingClusterHealthMBean.java	2012-07-09 22:06:01 UTC (rev 8545)
+++ branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922/src/main/org/jboss/jms/server/MessagingClusterHealthMBean.java	2012-07-10 00:56:49 UTC (rev 8546)
@@ -252,9 +252,9 @@
    {
       long delay = shutdownDelay;
       
+      long stopTime = System.currentTimeMillis();
       while (delay > 0)
       {
-         long stopTime = System.currentTimeMillis();
          try
          {
             Thread.sleep(delay);