[hornetq-commits] JBoss hornetq SVN: r11266 - in branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server: management/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-08-31 19:07:45 -0400 (Wed, 31 Aug 2011)
New Revision: 11266

Modified:
   branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
   branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
Log:
fixing a memory leak on management in case of server restarts (another intermittent failure)

Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-08-31 22:42:32 UTC (rev 11265)
+++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-08-31 23:07:45 UTC (rev 11266)
@@ -513,7 +513,7 @@
 
             if (System.currentTimeMillis() - start >= timeout)
             {
-               log.warn("Timed out waiting for backup activation to exit");
+               threadDump("Timed out waiting for backup activation to exit");
             }
 
             nodeManager.stopBackup();
@@ -861,6 +861,10 @@
          nodeManager.stop();
 
          nodeManager = null;
+         
+         addressSettingsRepository.clear();
+         
+         addressSettingsRepository.clearCache();
 
          HornetQServerImpl.log.info("HornetQ Server version " + getVersion().getFullVersion() + " [" + tempNodeID + "] stopped");
 

Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java	2011-08-31 22:42:32 UTC (rev 11265)
+++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java	2011-08-31 23:07:45 UTC (rev 11266)
@@ -621,7 +621,29 @@
 
          messageCounterManager.clear();
       }
+      
+      listeners.clear();
+      
+      registry.clear();
 
+      messagingServer = null;
+
+      securityRepository = null;
+
+      addressSettingsRepository = null;
+
+      messagingServerControl = null;
+
+      messageCounterManager = null;
+
+      postOffice = null;
+      
+      pagingManager = null;
+      
+      storageManager = null;
+      
+      messagingServer = null;
+
       registeredNames.clear();
 
       started = false;