QPID-4607: C++ Broker connection limit counting fails

Repair a few small but critical errors in program logic.
Repair several misconceptions in the self test including:
* provide visibility to connections (not sessions) so that they may be closed.
* dodge names that may survive open connections from other tests.
  Tests may pass if run first but then fail if run 30th.

The whole acl.py module could use a clean up pass to close out the
50+ open connections that exist that the end of the test.



git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1450841 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 1 deletions

diff --git a/cpp/src/qpid/acl/AclReader.cpp b/cpp/src/qpid/acl/AclReader.cpp
index 7eb9b82c64..0fc6437a6c 100644
--- a/cpp/src/qpid/acl/AclReader.cpp
+++ b/cpp/src/qpid/acl/AclReader.cpp
@@ -264,7 +264,8 @@ namespace acl {
         }
         // Propagate nonzero per-user max connection setting from CLI
         if (cliMaxConnPerUser > 0) {
-            (*connQuota)[AclData::ACL_KEYWORD_ACL] = cliMaxConnPerUser;
+            connQuotaRulesExist = true;
+            (*connQuota)[AclData::ACL_KEYWORD_ALL] = cliMaxConnPerUser;
         }
         // Loop to process the Acl file
         try {
@@ -413,6 +414,10 @@ namespace acl {
                     return false;
             }
         }
+
+        // We have processed a connection quota rule
+        connQuotaRulesExist = true;
+
         return true;
     }