[jboss-cvs] JBoss Messaging SVN: r5703 - trunk/src/main/org/jboss/messaging/core/server/impl.

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

Author: jmesnil
Date: 2009-01-23 09:48:08 -0500 (Fri, 23 Jan 2009)
New Revision: 5703

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
make sure the management notification destination is created *before* deploying predefined queues so that notifications when creating the queues & addresses are properly routed to the management notification address

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-01-23 13:28:05 UTC (rev 5702)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-01-23 14:48:08 UTC (rev 5703)
@@ -61,7 +61,6 @@
 import org.jboss.messaging.core.security.Role;
 import org.jboss.messaging.core.security.SecurityStore;
 import org.jboss.messaging.core.security.impl.SecurityStoreImpl;
-import org.jboss.messaging.core.server.Bindable;
 import org.jboss.messaging.core.server.Divert;
 import org.jboss.messaging.core.server.MessagingServer;
 import org.jboss.messaging.core.server.Queue;
@@ -320,12 +319,6 @@
 
       resourceManager.start();
 
-      // Deploy any pre-defined queues
-      deployQueues();
-
-      // Deply and pre-defined diverts
-      deployDiverts();
-
       // FIXME the destination corresponding to the notification address is always created
       // so that queues can be created wether the address is allowable or not (to revisit later)
       if (!postOffice.containsDestination(configuration.getManagementNotificationAddress()))
@@ -333,6 +326,12 @@
          postOffice.addDestination(configuration.getManagementNotificationAddress(), true);
       }
 
+      // Deploy any pre-defined queues
+      deployQueues();
+
+      // Deply and pre-defined diverts
+      deployDiverts();
+      
       String backupConnectorName = configuration.getBackupConnectorName();
 
       if (backupConnectorName != null)