summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2014-07-08 12:42:52 +0000
committerAlex Rudyy <orudyy@apache.org>2014-07-08 12:42:52 +0000
commitfc1519a03845766cedf3154e4db97ee307cbbf06 (patch)
treeb7ea990756182a2b50efbf7e618e167dd202e0ac
parentaae5c8ef6db4da0be4913db479e2b9290cc286f8 (diff)
downloadqpid-python-fc1519a03845766cedf3154e4db97ee307cbbf06.tar.gz
NO-JIRA: Make sure that test ReplicatedEnvironmentFacadeTest.testIntruderNodeIsDetected always closes intruder environment
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1608750 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
index 89e618482b..6c03e59d72 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
@@ -746,7 +746,18 @@ public class ReplicatedEnvironmentFacadeTest extends QpidTestCase
envConfig.setAllowCreate(true);
envConfig.setTransactional(true);
envConfig.setDurability(TEST_DURABILITY);
- ReplicatedEnvironment intruder = new ReplicatedEnvironment(environmentPathFile, replicationConfig, envConfig);
+ ReplicatedEnvironment intruder = null;
+ try
+ {
+ intruder = new ReplicatedEnvironment(environmentPathFile, replicationConfig, envConfig);
+ }
+ finally
+ {
+ if (intruder != null)
+ {
+ intruder.close();
+ }
+ }
assertTrue("Intruder node was not detected", intruderLatch.await(10, TimeUnit.SECONDS));
}