[jboss-cvs] JBoss Messaging SVN: r5746 - in trunk/src/main/org/jboss/messaging/core/postoffice: impl and 1 other directory.

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

Author: ataylor
Date: 2009-01-27 14:41:35 -0500 (Tue, 27 Jan 2009)
New Revision: 5746

Modified:
   trunk/src/main/org/jboss/messaging/core/postoffice/AddressManager.java
   trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
   trunk/src/main/org/jboss/messaging/core/postoffice/impl/SimpleAddressManager.java
   trunk/src/main/org/jboss/messaging/core/postoffice/impl/WildcardAddressManager.java
Log:
address manager tweaks

Modified: trunk/src/main/org/jboss/messaging/core/postoffice/AddressManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/AddressManager.java	2009-01-27 17:43:24 UTC (rev 5745)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/AddressManager.java	2009-01-27 19:41:35 UTC (rev 5746)
@@ -35,7 +35,7 @@
  */
 public interface AddressManager
 {
-   boolean addMapping(SimpleString address, Binding binding);
+   boolean addMapping(Binding binding);
 
    Bindings getBindings(SimpleString address);
 

Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java	2009-01-27 17:43:24 UTC (rev 5745)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java	2009-01-27 19:41:35 UTC (rev 5746)
@@ -637,7 +637,7 @@
 
    private void addBindingInMemory(final Binding binding) throws Exception
    {
-      boolean exists = addressManager.addMapping(binding.getAddress(), binding);
+      boolean exists = addressManager.addMapping(binding);
 
       if (!exists)
       {

Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/SimpleAddressManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/SimpleAddressManager.java	2009-01-27 17:43:24 UTC (rev 5745)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/SimpleAddressManager.java	2009-01-27 19:41:35 UTC (rev 5746)
@@ -48,13 +48,13 @@
 
    private final ConcurrentMap<SimpleString, Binding> nameMap = new ConcurrentHashMap<SimpleString, Binding>();
 
-   public boolean addMapping(final SimpleString address, final Binding binding)
+   public boolean addMapping(final Binding binding)
    {
       if (nameMap.putIfAbsent(binding.getUniqueName(), binding) != null)
       {
          throw new IllegalStateException("Binding already exists " + binding);
       }
-      return addMappingInternal(address, binding);
+      return addMappingInternal(binding.getAddress(), binding);
    }
 
    public Bindings getBindings(final SimpleString address)

Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/WildcardAddressManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/WildcardAddressManager.java	2009-01-27 17:43:24 UTC (rev 5745)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/WildcardAddressManager.java	2009-01-27 19:41:35 UTC (rev 5746)
@@ -89,16 +89,15 @@
     * If the address to add the binding to contains a wildcard then a copy of the binding (with the same underlying queue)
     * will be added to the actual mappings. Otherwise the binding is added as normal.
     *
-    * @param address the address to add the mapping to
     * @param binding the binding to add
     * @return true if the address was a new mapping
     */
-   public boolean addMapping(final SimpleString address, final Binding binding)
+   public boolean addMapping(final Binding binding)
    {
-      boolean exists = super.addMapping(address, binding);
+      boolean exists = super.addMapping(binding);
       if (!exists)
       {
-         Address add = addAndUpdateAddressMap(address);
+         Address add = addAndUpdateAddressMap(binding.getAddress());
          if (add.containsWildCard())
          {
             for (Address destAdd : add.getLinkedAddresses())
@@ -113,7 +112,7 @@
                Bindings bindings = super.getBindings(destAdd.getAddress());
                for (Binding b : bindings.getBindings())
                {
-                  super.addMappingInternal(address, b);
+                  super.addMappingInternal(binding.getAddress(), b);
                }
             }
          }