[hornetq-commits] JBoss hornetq SVN: r7959 - in trunk/src/main/org/hornetq/core: server/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2009-09-15 12:24:21 -0400 (Tue, 15 Sep 2009)
New Revision: 7959

Modified:
   trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
   trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
Core queue & address management registration

* moved registration of queue & addresses to the management service
  from PostOfficeImpl.addBinding() to the HornetQServerImpl class

Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2009-09-15 13:20:48 UTC (rev 7958)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2009-09-15 16:24:21 UTC (rev 7959)
@@ -455,27 +455,8 @@
    {
       binding.setID(generateTransientID());
 
-      boolean existed = addressManager.addBinding(binding);
-
-      // TODO - why is this code here?
-      // Shouldn't it be in HornetQServerImpl::createQueue??
-      if (binding.getType() == BindingType.LOCAL_QUEUE)
-      {
-         Queue queue = (Queue)binding.getBindable();
-
-         if (backup)
-         {
-            queue.setBackup();
-         }
-
-         managementService.registerQueue(queue, binding.getAddress(), storageManager);
-
-         if (!existed)
-         {
-            managementService.registerAddress(binding.getAddress());
-         }
-      }
-
+      addressManager.addBinding(binding);
+      
       TypedProperties props = new TypedProperties();
 
       props.putIntProperty(ManagementHelper.HDR_BINDING_TYPE, binding.getType().toInt());

Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2009-09-15 13:20:48 UTC (rev 7958)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java	2009-09-15 16:24:21 UTC (rev 7959)
@@ -1204,11 +1204,19 @@
                                                 true,
                                                 false);
 
+         if (configuration.isBackup())
+         {
+            queue.setBackup();
+         }
+         
          Binding binding = new LocalQueueBinding(queueBindingInfo.getAddress(), queue, nodeID);
 
          queues.put(queueBindingInfo.getPersistenceID(), queue);
 
          postOffice.addBinding(binding);
+         
+         managementService.registerAddress(queueBindingInfo.getAddress());
+         managementService.registerQueue(queue, queueBindingInfo.getAddress(), storageManager);
       }
 
       Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap = new HashMap<SimpleString, List<Pair<byte[], Long>>>();
@@ -1294,6 +1302,11 @@
 
       final Queue queue = queueFactory.createQueue(-1, address, queueName, filter, durable, temporary);
 
+      if (configuration.isBackup())
+      {
+         queue.setBackup();
+      }
+
       binding = new LocalQueueBinding(address, queue, nodeID);
 
       if (durable)
@@ -1302,6 +1315,9 @@
       }
 
       postOffice.addBinding(binding);
+      
+      managementService.registerAddress(address);
+      managementService.registerQueue(queue, address, storageManager);
 
       return queue;
    }