Make sure @AfterTest runs and protect it againts failures

infinispan · Sep 27, 2011 · 537468b · 537468b
1 parent 80d97d5
commit 537468b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...estore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreConfigTest.java b/...estore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreConfigTest.java
@@ -79,9 +79,12 @@ public void simpleTest() throws IOException {
       assertEquals("v", cache.get("k"));
    }
 
-   @AfterTest
+   @AfterTest(alwaysRun = true)
    public void tearDown() {
-      hotRodServer.stop();
-      cacheManager.stop();
+      try {
+         if (hotRodServer != null) hotRodServer.stop();
+      } finally {
+         if (cacheManager != null) cacheManager.stop();
+      }
    }
 }