[jboss-cvs] JBoss Messaging SVN: r4639 - in trunk/src/main/org/jboss/messaging/core: settings and 1 other directories.

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

Author: ataylor
Date: 2008-07-07 05:38:46 -0400 (Mon, 07 Jul 2008)
New Revision: 4639

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/src/main/org/jboss/messaging/core/settings/HierarchicalRepository.java
   trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java
Log:
clear repository on stop

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-07-07 08:37:41 UTC (rev 4638)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-07-07 09:38:46 UTC (rev 4639)
@@ -84,7 +84,7 @@
    private SecurityStore securityStore;
    private ConnectionManager connectionManager;
    private RemotingSessionListener sessionListener; 
-   private HierarchicalRepository<QueueSettings> queueSettingsRepository = new HierarchicalObjectRepository<QueueSettings>();;
+   private HierarchicalRepository<QueueSettings> queueSettingsRepository = new HierarchicalObjectRepository<QueueSettings>();
    private ScheduledExecutorService scheduledExecutor;   
    private QueueFactory queueFactory;
    private PostOffice postOffice;
@@ -222,7 +222,7 @@
       executorFactory = null;
       securityRepository = null;
       securityStore = null;
-      queueSettingsRepository = null;
+      queueSettingsRepository.clear();
       scheduledExecutor.shutdown();
       queueFactory = null;
       resourceManager = null;

Modified: trunk/src/main/org/jboss/messaging/core/settings/HierarchicalRepository.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/settings/HierarchicalRepository.java	2008-07-07 08:37:41 UTC (rev 4638)
+++ trunk/src/main/org/jboss/messaging/core/settings/HierarchicalRepository.java	2008-07-07 09:38:46 UTC (rev 4639)
@@ -67,4 +67,9 @@
     * @param listener
     */
    void unRegisterListener(HierarchicalRepositoryChangeListener listener);
+
+   /**
+    * clear the repository
+    */
+   void clear();
 }

Modified: trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java	2008-07-07 08:37:41 UTC (rev 4638)
+++ trunk/src/main/org/jboss/messaging/core/settings/impl/HierarchicalObjectRepository.java	2008-07-07 09:38:46 UTC (rev 4639)
@@ -22,20 +22,15 @@
 
 package org.jboss.messaging.core.settings.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
+import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.settings.HierarchicalRepository;
+import org.jboss.messaging.core.settings.HierarchicalRepositoryChangeListener;
 import org.jboss.messaging.core.settings.Mergeable;
-import org.jboss.messaging.core.settings.HierarchicalRepositoryChangeListener;
-import org.jboss.messaging.core.logging.Logger;
 
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
+
 /**
  * allows objects to be mapped against a regex pattern and held in order in a list
  *
@@ -183,6 +178,13 @@
       defaultmatch = defaultValue;
    }
 
+   public void clear()
+   {
+      cache.clear();
+      listeners.clear();
+      matches.clear();
+   }
+
    private void onChange()
    {
       for (HierarchicalRepositoryChangeListener listener : listeners)