Attempt one at merge from r1021441:HEADgrkvlt-network-20101013

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 2 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
index c4ffcd26bf..8bce180784 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
@@ -20,9 +20,13 @@
  */
 package org.apache.qpid.server.management;
 
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.qpid.server.logging.actors.ManagementActor;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.thread.Threading;
 
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanInfo;
@@ -45,12 +49,13 @@ public abstract class AMQManagedObject extends DefaultManagedObject
     /**
      * broadcaster support class
      */
-    protected NotificationBroadcasterSupport _broadcaster = new NotificationBroadcasterSupport();
+    protected NotificationBroadcasterSupport _broadcaster = new NotificationBroadcasterSupport(
+            Executors.newCachedThreadPool(Threading.getThreadFactory()));
 
     /**
      * sequence number for notifications
      */
-    protected long _notificationSequenceNumber = 0;
+    protected AtomicLong _notificationSequenceNumber = new AtomicLong(0);
 
     protected MBeanInfo _mbeanInfo;