2 files changed, 7 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/BrokerQueue.cpp b/cpp/src/qpid/broker/BrokerQueue.cpp
index f8bffa01a3..3d4d6b83be 100644
--- a/cpp/src/qpid/broker/BrokerQueue.cpp
+++ b/cpp/src/qpid/broker/BrokerQueue.cpp
@@ -49,7 +49,8 @@ Queue::Queue(const string& _name, bool _autodelete,
     next(0),
     exclusive(0),
     persistenceId(0),
-    serializer(false)
+    serializer(false),
+    dispatchCallback(boost::bind(&Queue::dispatch, this))
 {
 }
 
@@ -79,7 +80,7 @@ void Queue::recover(Message::shared_ptr& msg){
 void Queue::process(Message::shared_ptr& msg){
  
     push(msg);
-    serializer.execute(boost::bind(&Queue::dispatch, this));
+    serializer.execute(dispatchCallback);
    
 }
 
@@ -89,13 +90,13 @@ void Queue::requeue(Message::shared_ptr& msg){
     	Mutex::ScopedLock locker(messageLock);
     	messages.push_front(msg);
     }
-    serializer.execute(boost::bind(&Queue::dispatch, this));
+    serializer.execute(dispatchCallback);
    
 }
 
 
 void Queue::requestDispatch(){
-    serializer.execute(boost::bind(&Queue::dispatch, this));
+    serializer.execute(dispatchCallback);
 }
 
 
diff --git a/cpp/src/qpid/broker/BrokerQueue.h b/cpp/src/qpid/broker/BrokerQueue.h
index f82a7dac55..4214b4b03f 100644
--- a/cpp/src/qpid/broker/BrokerQueue.h
+++ b/cpp/src/qpid/broker/BrokerQueue.h
@@ -75,7 +75,8 @@ namespace qpid {
             std::auto_ptr<QueuePolicy> policy;            
             QueueBindings bindings;
             boost::shared_ptr<Exchange> alternateExchange;
-	    qpid::sys::Serializer serializer;
+            qpid::sys::Serializer serializer;
+            qpid::sys::Serializer::Task dispatchCallback;
 
             void pop();
             void push(Message::shared_ptr& msg);