diff options
| author | Charles E. Rolke <chug@apache.org> | 2013-07-25 18:26:20 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2013-07-25 18:26:20 +0000 |
| commit | fa822ee6f520f5b0c1333f3da478c53746b31f0f (patch) | |
| tree | 610c9c385c00956255f1a79e828271a200418b98 /qpid/cpp/src | |
| parent | 7b1abad600adc4c8eb8f6af180ed61ca01ca3138 (diff) | |
| download | qpid-python-fa822ee6f520f5b0c1333f3da478c53746b31f0f.tar.gz | |
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
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 |