summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorCarl C. Trieloff <cctrieloff@apache.org>2008-07-31 21:02:09 +0000
committerCarl C. Trieloff <cctrieloff@apache.org>2008-07-31 21:02:09 +0000
commitd208233b0b8861d0154f62ee165e344ea6b21406 (patch)
tree35916543ab70fe6f11b791e5e7b761f6def95f68 /cpp
parent7bb552ba7ec53a64a4ed2a41c5cfaa6b58885397 (diff)
downloadqpid-python-d208233b0b8861d0154f62ee165e344ea6b21406.tar.gz
small cleanup
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@681491 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/qpid/acl/Acl.cpp1
-rw-r--r--cpp/src/qpid/broker/SessionAdapter.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp
index 3f78317d82..a1dff3a039 100644
--- a/cpp/src/qpid/acl/Acl.cpp
+++ b/cpp/src/qpid/acl/Acl.cpp
@@ -62,7 +62,6 @@ using namespace std;
case QUEUE: return "Queue";
case EXCHANGE: return "Exchnage";
case ROUTINGKEY: return "RoutingKey";
- case SESSION: return "Session";
default: return "Unknown";
}
}
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp
index 0c0d7ff70a..bf4cd39393 100644
--- a/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/cpp/src/qpid/broker/SessionAdapter.cpp
@@ -447,7 +447,7 @@ SessionAdapter::MessageHandlerImpl::subscribe(const string& queueName,
{
// add flags as needed
if (!acl->authorise(getConnection().getUserId(),acl::CONSUME,acl::QUEUE,queueName,NULL) )
- throw NotAllowedException("ACL denied Session subscribe request");
+ throw NotAllowedException("ACL denied Queue subscribe request");
}
Queue::shared_ptr queue = getQueue(queueName);