[hornetq-commits] JBoss hornetq SVN: r9710 - trunk/src/main/org/hornetq/core/postoffice/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-09-21 18:27:14 -0400 (Tue, 21 Sep 2010)
New Revision: 9710

Modified:
   trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
Log:
HORNETQ-521 - Fixing failing test on ClusteredGroupingTest

Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2010-09-21 22:25:29 UTC (rev 9709)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java	2010-09-21 22:27:14 UTC (rev 9710)
@@ -482,7 +482,14 @@
       if (binding.getType() == BindingType.LOCAL_QUEUE)
       {
          managementService.unregisterQueue(uniqueName, binding.getAddress());
-         
+      }
+      else if (binding.getType() == BindingType.DIVERT)
+      {
+         managementService.unregisterDivert(uniqueName);
+      }
+      
+      if (binding.getType() != BindingType.DIVERT)
+      {
          TypedProperties props = new TypedProperties();
 
          props.putSimpleStringProperty(ManagementHelper.HDR_ADDRESS, binding.getAddress());
@@ -495,10 +502,6 @@
 
          managementService.sendNotification(new Notification(null, NotificationType.BINDING_REMOVED, props));
       }
-      else if (binding.getType() == BindingType.DIVERT)
-      {
-         managementService.unregisterDivert(uniqueName);
-      }
 
       binding.close();