[jboss-cvs] JBoss Messaging SVN: r5739 - in trunk/src/main/org/jboss/messaging/core/postoffice: impl and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 27 08:29:03 EST 2009
Author: ataylor
Date: 2009-01-27 08:29:03 -0500 (Tue, 27 Jan 2009)
New Revision: 5739
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:
https://jira.jboss.org/jira/browse/JBMESSAGING-1492
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/AddressManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/AddressManager.java 2009-01-27 13:11:09 UTC (rev 5738)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/AddressManager.java 2009-01-27 13:29:03 UTC (rev 5739)
@@ -35,8 +35,6 @@
*/
public interface AddressManager
{
- void addBinding(Binding binding);
-
boolean addMapping(SimpleString address, 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 13:11:09 UTC (rev 5738)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2009-01-27 13:29:03 UTC (rev 5739)
@@ -655,8 +655,6 @@
managementService.registerQueue(queue, binding.getAddress(), storageManager);
}
-
- addressManager.addBinding(binding);
}
private Binding removeBindingInMemory(final SimpleString bindingName) throws Exception
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 13:11:09 UTC (rev 5738)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/SimpleAddressManager.java 2009-01-27 13:29:03 UTC (rev 5739)
@@ -48,37 +48,15 @@
private final ConcurrentMap<SimpleString, Binding> nameMap = new ConcurrentHashMap<SimpleString, Binding>();
- public void addBinding(final Binding binding)
+ public boolean addMapping(final SimpleString address, final Binding binding)
{
if (nameMap.putIfAbsent(binding.getUniqueName(), binding) != null)
{
throw new IllegalStateException("Binding already exists " + binding);
}
+ return addMappingInternal(address, binding);
}
- public boolean addMapping(final SimpleString address, final Binding binding)
- {
- Bindings bindings = mappings.get(address);
-
- Bindings prevBindings = null;
-
- if (bindings == null)
- {
- bindings = new BindingsImpl();
-
- prevBindings = mappings.putIfAbsent(address, bindings);
-
- if (prevBindings != null)
- {
- bindings = prevBindings;
- }
- }
-
- bindings.addBinding(binding);
-
- return prevBindings != null;
- }
-
public Bindings getBindings(final SimpleString address)
{
return mappings.get(address);
@@ -174,4 +152,27 @@
return theBinding;
}
+
+ protected boolean addMappingInternal(final SimpleString address, final Binding binding)
+ {
+ Bindings bindings = mappings.get(address);
+
+ Bindings prevBindings = null;
+
+ if (bindings == null)
+ {
+ bindings = new BindingsImpl();
+
+ prevBindings = mappings.putIfAbsent(address, bindings);
+
+ if (prevBindings != null)
+ {
+ bindings = prevBindings;
+ }
+ }
+
+ bindings.addBinding(binding);
+
+ return prevBindings != null;
+ }
}
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 13:11:09 UTC (rev 5738)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/WildcardAddressManager.java 2009-01-27 13:29:03 UTC (rev 5739)
@@ -75,7 +75,7 @@
List<Binding> theBindings = b.getBindings();
for (Binding theBinding : theBindings)
{
- super.addMapping(address, theBinding);
+ super.addMappingInternal(address, theBinding);
}
}
}
@@ -103,7 +103,7 @@
{
for (Address destAdd : add.getLinkedAddresses())
{
- super.addMapping(destAdd.getAddress(), binding);
+ super.addMappingInternal(destAdd.getAddress(), binding);
}
}
else
@@ -113,7 +113,7 @@
Bindings bindings = super.getBindings(destAdd.getAddress());
for (Binding b : bindings.getBindings())
{
- super.addMapping(address, b);
+ super.addMappingInternal(address, b);
}
}
}
More information about the jboss-cvs-commits
mailing list