From fa822ee6f520f5b0c1333f3da478c53746b31f0f Mon Sep 17 00:00:00 2001
From: "Charles E. Rolke" <chug@apache.org>
Date: Thu, 25 Jul 2013 18:26:20 +0000
Subject: QPID-5011: merge fix to 0.24 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.24@1507084 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
index 3d703066b4..7a5d0ab53d 100644
--- a/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
+++ b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
@@ -102,10 +102,12 @@ bool ConnectionCounter::countConnectionLH(
     if (eRef != theMap.end()) {
         count = (uint16_t)(*eRef).second + 1;
         (*eRef).second = count;
-        result = (enforceLimit ? count <= theLimit : true);
     } else {
         theMap[theName] = count = 1;
     }
+    if (enforceLimit) { 
+        result = count <= theLimit;
+    }
     if (emitLog) {
         QPID_LOG(trace, "ACL ConnectionApprover user=" << theName
             << " limit=" << theLimit
-- 
cgit v1.2.1