expose less internals and some term clean up thanks to gsim's comments

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@880755 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index 3e23af99c0..9680ada936 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -276,10 +276,10 @@ SemanticState::ConsumerImpl::ConsumerImpl(SemanticState* _parent,
         
         if (agent != 0)
         {
-            mgmtObject = new _qmf::Subscription(agent, this, ms , queue->GetManagementObject()->getObjectId() ,name ,arguments,
-                acquire, ackExpected, syncFrequency, resumeId, resumeTtl, exclusive);
+            mgmtObject = new _qmf::Subscription(agent, this, ms , queue->GetManagementObject()->getObjectId() ,name,
+                !acquire, ackExpected, exclusive ,arguments);
             agent->addObject (mgmtObject, agent->allocateId(this));
-            mgmtObject->set_mode("WINDOW");
+            mgmtObject->set_creditMode("WINDOW");
         }
     }
 }
@@ -335,7 +335,6 @@ bool SemanticState::ConsumerImpl::accept(intrusive_ptr<Message> msg)
     // in future.
     // 
     blocked = !(filter(msg) && checkCredit(msg));
-    if (mgmtObject && !blocked && acquire) { mgmtObject->inc_accepted(); }
     return !blocked;
 }
 
@@ -566,7 +565,7 @@ void SemanticState::ConsumerImpl::setWindowMode()
 {
     windowing = true;
     if (mgmtObject){
-        mgmtObject->set_mode("WINDOW");
+        mgmtObject->set_creditMode("WINDOW");
     }
 }
 
@@ -574,7 +573,7 @@ void SemanticState::ConsumerImpl::setCreditMode()
 {
     windowing = false;
     if (mgmtObject){
-        mgmtObject->set_mode("CREDIT");
+        mgmtObject->set_creditMode("CREDIT");
     }
 }