diff options
| author | Keith Wall <kwall@apache.org> | 2014-08-12 15:14:18 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-08-12 15:14:18 +0000 |
| commit | e90094911524b30e5eac5368ec1023ac61b9f3ae (patch) | |
| tree | 35f63bff32f4b3deeb481f316ef7165c1286f9a6 /qpid/java | |
| parent | 049d58ecf81450148665a299cdb6cfaa44e5cfd5 (diff) | |
| download | qpid-python-e90094911524b30e5eac5368ec1023ac61b9f3ae.tar.gz | |
QPID-5967: [Java Broker Tests] Add missing test assertion and extra logging to understand occasional failure.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617504 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 11 insertions, 0 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java index 858bca80a8..d18dec3825 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java @@ -289,10 +289,20 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan { try { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Closing replicated environment"); + } + closeEnvironment(); } finally { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Deregistering environment home " + _environmentDirectory); + } + EnvHomeRegistry.getInstance().deregisterHome(_environmentDirectory); } } diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java index a3c864d427..0791637ba3 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java @@ -306,6 +306,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase } } waitForAttributeChanged(_baseNodeRestUrl + NODE1, VirtualHostNode.STATE, State.ERRORED.name()); + waitForAttributeChanged(_baseNodeRestUrl + NODE3, VirtualHostNode.STATE, State.ERRORED.name()); } private void createHANode(String nodeName, int nodePort, int helperPort) throws Exception |