3 files changed, 19 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp
index 2f1518f871..28391a5c78 100644
--- a/cpp/src/qpid/cluster/Connection.cpp
+++ b/cpp/src/qpid/cluster/Connection.cpp
@@ -22,6 +22,7 @@
 #include "Cluster.h"
 
 #include "qpid/broker/SessionState.h"
+#include "qpid/broker/SemanticState.h"
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/framing/AllInvoker.h"
 #include "qpid/framing/ClusterConnectionDeliverCloseBody.h"
@@ -159,6 +160,13 @@ void Connection::deliverBuffer(Buffer& buf) {
         delivered(mcastDecoder.frame);
 }
 
+void Connection::consumerState(const string& name, bool blocked, bool notifyEnabled) {
+    broker::SessionHandler& h = connection.getChannel(currentChannel);
+    broker::SessionState* s = h.getSession();
+    broker::SemanticState::ConsumerImpl& c = s->getConsumer(name);
+    c.setBlocked(blocked);
+    if (notifyEnabled) c.enableNotify(); else c.disableNotify();
+}
 
 void Connection::sessionState(
     const SequenceNumber& replayStart,
diff --git a/cpp/src/qpid/cluster/Connection.h b/cpp/src/qpid/cluster/Connection.h
index b537470b41..3b5298a8a1 100644
--- a/cpp/src/qpid/cluster/Connection.h
+++ b/cpp/src/qpid/cluster/Connection.h
@@ -89,6 +89,8 @@ class Connection :
     void deliverBuffer(framing::Buffer&);
     void delivered(framing::AMQFrame&);
 
+    void consumerState(const std::string& name, bool blocked, bool notifyEnabled);
+    
     // ==== Used in catch-up mode to build initial state.
     // 
     // State dump methods.
diff --git a/cpp/src/qpid/cluster/DumpClient.cpp b/cpp/src/qpid/cluster/DumpClient.cpp
index 58aa14655c..c262115f9f 100644
--- a/cpp/src/qpid/cluster/DumpClient.cpp
+++ b/cpp/src/qpid/cluster/DumpClient.cpp
@@ -35,6 +35,8 @@
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/ClusterConnectionMembershipBody.h"
 #include "qpid/framing/ClusterConnectionShadowReadyBody.h"
+#include "qpid/framing/ClusterConnectionSessionStateBody.h"
+#include "qpid/framing/ClusterConnectionConsumerStateBody.h"
 #include "qpid/framing/enum.h"
 #include "qpid/framing/ProtocolVersion.h"
 #include "qpid/log/Statement.h"
@@ -227,7 +229,13 @@ void DumpClient::dumpConsumer(broker::SemanticState::ConsumerImpl* ci) {
     shadowSession.messageSetFlowMode(ci->getName(), ci->isWindowing() ? FLOW_MODE_WINDOW : FLOW_MODE_CREDIT);
     shadowSession.messageFlow(ci->getName(), CREDIT_UNIT_MESSAGE, ci->getMsgCredit());
     shadowSession.messageFlow(ci->getName(), CREDIT_UNIT_BYTE, ci->getByteCredit());
-    // FIXME aconway 2008-09-23: need to replicate ConsumerImpl::blocked and notifyEnabled?
+    ClusterConnectionConsumerStateBody state(
+        ProtocolVersion(),
+        ci->getName(),
+        ci->isBlocked(),
+        ci->isNotifyEnabld()
+    );
+    client::SessionBase_0_10Access(shadowSession).get()->send(state);
     QPID_LOG(debug, dumperId << " dumped consumer " << ci->getName() << " on " << shadowSession.getId());
 }