diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2013-01-22 21:35:20 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2013-01-22 21:35:20 +0000 |
| commit | 58e5ec4839a77ed0a859e85f94386fbb9d57a451 (patch) | |
| tree | 9de327f5ad1146f0d9eac39d8abe071c0d4ca938 /qpid/cpp/src | |
| parent | 66d0e713e1ec31e1ef1b686ea7e21191e52ba2d4 (diff) | |
| download | qpid-python-58e5ec4839a77ed0a859e85f94386fbb9d57a451.tar.gz | |
QPID-4546: review feedback and re-enable federation system tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1437188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Link.cpp | 14 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/CMakeLists.txt | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp index 70d0f68427..5d01a567b5 100644 --- a/qpid/cpp/src/qpid/broker/Link.cpp +++ b/qpid/cpp/src/qpid/broker/Link.cpp @@ -487,8 +487,9 @@ void Link::ioThreadProcessing() void Link::maintenanceVisit () { Mutex::ScopedLock mutex(lock); - if (state == STATE_WAITING) - { + + switch (state) { + case STATE_WAITING: visitCount++; if (visitCount >= currentInterval) { @@ -501,11 +502,16 @@ void Link::maintenanceVisit () startConnectionLH(); } } - } - else if (state == STATE_OPERATIONAL) { + break; + + case STATE_OPERATIONAL: if ((!active.empty() || !created.empty() || !cancellations.empty()) && connection && connection->isOpen()) connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this)); + break; + + default: // no-op for all other states + break; } } diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt index 815b6d1dd6..bc13e2ecdd 100644 --- a/qpid/cpp/src/tests/CMakeLists.txt +++ b/qpid/cpp/src/tests/CMakeLists.txt @@ -314,6 +314,7 @@ if (PYTHON_EXECUTABLE) add_test (ha_tests ${test_wrap} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ha_tests.py) add_test (ipv6_test ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/ipv6_test${test_script_suffix}) add_test (federation_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_federation_tests${test_script_suffix}) + add_test (federation_sys_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_federation_sys_tests${test_script_suffix}) if (BUILD_ACL) add_test (acl_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_acl_tests${test_script_suffix}) endif (BUILD_ACL) |