2 files changed, 7 insertions, 10 deletions
diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/cpp/src/qpid/cluster/Cpg.cpp
index c5a1b72003..92fceba904 100644
--- a/cpp/src/qpid/cluster/Cpg.cpp
+++ b/cpp/src/qpid/cluster/Cpg.cpp
@@ -107,17 +107,16 @@ void Cpg::leave() {
     check(cpg_leave(handle, &group), cantLeaveMsg(group));
 }
 
-bool Cpg::isFlowControlEnabled() {
-    cpg_flow_control_state_t flowState;
-    check(cpg_flow_control_state_get(handle, &flowState), "Cannot get CPG flow control status.");
-    return flowState == CPG_FLOW_CONTROL_ENABLED;
-}
+
+
 
 bool Cpg::mcast(const iovec* iov, int iovLen) {
-    if (isFlowControlEnabled()) {
-        QPID_LOG(debug, "CPG flow control enabled")
+    // Check for flow control
+    cpg_flow_control_state_t flowState;
+    check(cpg_flow_control_state_get(handle, &flowState), "Cannot get CPG flow control status.");
+    if (flowState == CPG_FLOW_CONTROL_ENABLED)
         return false;
-    }
+
     cpg_error_t result;
     do {
         result = cpg_mcast_joined(handle, CPG_TYPE_AGREED, const_cast<iovec*>(iov), iovLen);
diff --git a/cpp/src/qpid/cluster/Cpg.h b/cpp/src/qpid/cluster/Cpg.h
index 5ac5a5bdbc..ac27a09ae6 100644
--- a/cpp/src/qpid/cluster/Cpg.h
+++ b/cpp/src/qpid/cluster/Cpg.h
@@ -114,8 +114,6 @@ class Cpg : public sys::IOHandle {
 
     int getFd();
     
-    bool isFlowControlEnabled();
-    
   private:
     static std::string errorStr(cpg_error_t err, const std::string& msg);
     static std::string cantJoinMsg(const Name&);