[hornetq-commits] JBoss hornetq SVN: r10214 - in branches/Branch_2_2_EAP/src/main/org/hornetq/core: server/impl and 2 other directories.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-02-15 23:43:31 -0500 (Tue, 15 Feb 2011)
New Revision: 10214

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
Log:
Fixing test on AddressSettings

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2011-02-16 04:28:00 UTC (rev 10213)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2011-02-16 04:43:31 UTC (rev 10214)
@@ -467,7 +467,7 @@
    public synchronized Binding removeBinding(final SimpleString uniqueName) throws Exception
    {
       
-      addressSettingsRepository.clear();
+      addressSettingsRepository.clearCache();
       
       Binding binding = addressManager.removeBinding(uniqueName);
 

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-02-16 04:28:00 UTC (rev 10213)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-02-16 04:43:31 UTC (rev 10214)
@@ -1011,7 +1011,7 @@
 
    public void destroyQueue(final SimpleString queueName, final ServerSession session) throws Exception
    {
-      addressSettingsRepository.clear();
+      addressSettingsRepository.clearCache();
 
       Binding binding = postOffice.getBinding(queueName);
 

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java	2011-02-16 04:28:00 UTC (rev 10213)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java	2011-02-16 04:43:31 UTC (rev 10214)
@@ -63,5 +63,7 @@
     */
    void clear();
    
+   void clearCache();
+   
    int getCacheSize();
 }

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java	2011-02-16 04:28:00 UTC (rev 10213)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java	2011-02-16 04:43:31 UTC (rev 10214)
@@ -69,7 +69,7 @@
     */
    public void addMatch(final String match, final T value)
    {
-      cache.clear();
+      clearCache();
       Match.verify(match);
       Match<T> match1 = new Match<T>(match);
       match1.setValue(value);
@@ -159,7 +159,7 @@
    {
       matches.remove(match);
       new Exception("Clearing cache").printStackTrace();
-      cache.clear();
+      clearCache();
       onChange();
    }
 
@@ -180,16 +180,21 @@
     */
    public void setDefault(final T defaultValue)
    {
-      cache.clear();
+      clearCache();
       defaultmatch = defaultValue;
    }
 
    public void clear()
    {
-      cache.clear();
+      clearCache();
       listeners.clear();
       matches.clear();
    }
+   
+   public void clearCache()
+   {
+      cache.clear();
+   }
 
    private void onChange()
    {