diff options
| -rw-r--r-- | cpp/src/qpid/broker/SemanticState.cpp | 11 | ||||
| -rw-r--r-- | specs/management-schema.xml | 16 |
2 files changed, 11 insertions, 16 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"); } } diff --git a/specs/management-schema.xml b/specs/management-schema.xml index ac75e3618c..1e345b5ea5 100644 --- a/specs/management-schema.xml +++ b/specs/management-schema.xml @@ -204,19 +204,15 @@ =============================================================== --> <class name="Subscription"> - <property name="sessionRef" type="objId" references="Exchange" access="RC" index="y" parentRef="y"/> - <property name="queueRef" type="objId" references="Session" access="RC" index="y"/> + <property name="sessionRef" type="objId" references="Session" access="RC" index="y" parentRef="y"/> + <property name="queueRef" type="objId" references="Queue" access="RC" index="y"/> <property name="name" type="sstr" access="RC" index="y"/> - <property name="arguments" type="map" access="RC"/> - <property name="acquire" type="bool" access="RC"/> - <property name="ackExpected" type="bool" access="RC"/> - <property name="syncFrequency" type="uint32" access="RC"/> - <property name="resumeID" type="sstr" access="RC"/> - <property name="resumeTTL" type="uint64" access="RC"/> + <property name="browsing" type="bool" access="RC"/> + <property name="acknowledged" type="bool" access="RC"/> <property name="exclusive" type="bool" access="RC"/> - <property name="mode" type="sstr" access="RO" desc="WINDOW or CREDIT"/> + <property name="creditMode" type="sstr" access="RO" desc="WINDOW or CREDIT"/> + <property name="arguments" type="map" access="RC"/> <statistic name="delivered" type="count64" unit="message" desc="Messages delivered"/> - <statistic name="accepted" type="count64" unit="message" desc="Messages accepted"/> </class> <!-- |