summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/console/SessionManager.cpp2
-rw-r--r--qpid/cpp/src/tests/ManagementTest.cpp27
2 files changed, 28 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/console/SessionManager.cpp b/qpid/cpp/src/qpid/console/SessionManager.cpp
index 336f429c5d..feccf92b01 100644
--- a/qpid/cpp/src/qpid/console/SessionManager.cpp
+++ b/qpid/cpp/src/qpid/console/SessionManager.cpp
@@ -437,8 +437,8 @@ void SessionManager::handleContentInd(Broker* broker, Buffer& buffer, uint32_t s
if (syncSequenceList.count(sequence) == 1) {
if (!object.isDeleted())
getResult.push_back(object);
+ return;
}
- return;
}
if (listener) {
diff --git a/qpid/cpp/src/tests/ManagementTest.cpp b/qpid/cpp/src/tests/ManagementTest.cpp
index a3d29ec22c..e6f2e2e3fd 100644
--- a/qpid/cpp/src/tests/ManagementTest.cpp
+++ b/qpid/cpp/src/tests/ManagementTest.cpp
@@ -21,6 +21,7 @@
#include "qpid/management/ManagementObject.h"
#include "qpid/framing/Buffer.h"
+#include "qpid/console/ObjectId.h"
#include "unit_test.h"
QPID_AUTO_TEST_SUITE(ManagementTestSuite)
@@ -80,6 +81,32 @@ QPID_AUTO_TEST_CASE(testObjectIdAttach) {
BOOST_CHECK_EQUAL(out2.str(), "10-20-30-40-50");
}
+QPID_AUTO_TEST_CASE(testConsoleObjectId) {
+ qpid::console::ObjectId oid1, oid2;
+
+ oid1.setValue(1, 2);
+ oid2.setValue(3, 4);
+
+ BOOST_CHECK(oid1 < oid2);
+ BOOST_CHECK(oid1 <= oid2);
+ BOOST_CHECK(oid2 > oid1);
+ BOOST_CHECK(oid2 >= oid1);
+ BOOST_CHECK(oid1 != oid2);
+ BOOST_CHECK(oid1 == oid1);
+
+ oid1.setValue(3, 6);
+ oid2.setValue(3, 4);
+
+ BOOST_CHECK(oid1 > oid2);
+ BOOST_CHECK(oid1 >= oid2);
+ BOOST_CHECK(oid2 < oid1);
+ BOOST_CHECK(oid2 <= oid1);
+ BOOST_CHECK(oid1 != oid2);
+
+ oid2.setValue(3, 6);
+ BOOST_CHECK(oid1 == oid2);
+}
+
QPID_AUTO_TEST_SUITE_END()