diff options
| -rw-r--r-- | cpp/src/qpid/broker/SessionAdapter.cpp | 4 | ||||
| -rwxr-xr-x | cpp/src/tests/acl.py | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp index 4ee3a97357..2ac6d66e62 100644 --- a/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/cpp/src/qpid/broker/SessionAdapter.cpp @@ -338,8 +338,8 @@ void SessionAdapter::QueueHandlerImpl::declare(const string& name, const string& params.insert(make_pair(acl::PROP_EXCLUSIVE, std::string(exclusive ? _TRUE : _FALSE))); params.insert(make_pair(acl::PROP_AUTODELETE, std::string(autoDelete ? _TRUE : _FALSE))); params.insert(make_pair(acl::PROP_POLICYTYPE, arguments.getAsString("qpid.policy_type"))); - params.insert(make_pair(acl::PROP_MAXQUEUECOUNT, arguments.getAsString("qpid.max_count"))); - params.insert(make_pair(acl::PROP_MAXQUEUESIZE, arguments.getAsString("qpid.max_size"))); + params.insert(make_pair(acl::PROP_MAXQUEUECOUNT, boost::lexical_cast<string>(arguments.getAsInt("qpid.max_count")))); + params.insert(make_pair(acl::PROP_MAXQUEUESIZE, boost::lexical_cast<string>(arguments.getAsInt64("qpid.max_size")))); if (!acl->authorise(getConnection().getUserId(),acl::ACT_CREATE,acl::OBJ_QUEUE,name,¶ms) ) throw NotAllowedException(QPID_MSG("ACL denied queue create request from " << getConnection().getUserId())); diff --git a/cpp/src/tests/acl.py b/cpp/src/tests/acl.py index e6cfdb56d3..2d776e9941 100755 --- a/cpp/src/tests/acl.py +++ b/cpp/src/tests/acl.py @@ -260,8 +260,8 @@ class ACLTests(TestBase010): try: queue_options = {} - queue_options["qpid.max_count"] = "200" - queue_options["qpid.max_size"] = "500" + queue_options["qpid.max_count"] = 200 + queue_options["qpid.max_size"] = 500 session.queue_declare(queue="q5", exclusive=True, arguments=queue_options) self.fail("ACL should deny queue create request with name=q2, qpid.max_size=500 and qpid.max_count=200"); except qpid.session.SessionException, e: @@ -270,8 +270,8 @@ class ACLTests(TestBase010): try: queue_options = {} - queue_options["qpid.max_count"] = "200" - queue_options["qpid.max_size"] = "100" + queue_options["qpid.max_count"] = 200 + queue_options["qpid.max_size"] = 100 session.queue_declare(queue="q2", exclusive=True, arguments=queue_options) except qpid.session.SessionException, e: if (530 == e.args[0].error_code): @@ -362,8 +362,8 @@ class ACLTests(TestBase010): try: queue_options = {} - queue_options["qpid.max_count"] = "200" - queue_options["qpid.max_size"] = "500" + queue_options["qpid.max_count"] = 200 + queue_options["qpid.max_size"] = 500 session.queue_declare(queue="q5", arguments=queue_options) self.fail("ACL should deny queue create request with name=q2 maxqueuesize=500 maxqueuecount=200"); except qpid.session.SessionException, e: @@ -372,8 +372,8 @@ class ACLTests(TestBase010): try: queue_options = {} - queue_options["qpid.max_count"] = "100" - queue_options["qpid.max_size"] = "500" + queue_options["qpid.max_count"] = 100 + queue_options["qpid.max_size"] = 500 session.queue_declare(queue="q5", arguments=queue_options) except qpid.session.SessionException, e: if (530 == e.args[0].error_code): |