Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-392 [created] 2adabaac3


GEODE-392: CacheTestCase.close should look for open caches

The closeCache method tries to find an existing cache, even if the
static cache variable is null. However, it didn't consider the case
where the static cache variable was not null, but was closed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2adabaac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2adabaac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2adabaac

Branch: refs/heads/feature/GEODE-392
Commit: 2adabaac33f07616765158aa030620f185a5274e
Parents: 4a42443
Author: Dan Smith <[email protected]>
Authored: Fri Oct 23 10:56:51 2015 -0700
Committer: Dan Smith <[email protected]>
Committed: Fri Oct 23 11:27:05 2015 -0700

----------------------------------------------------------------------
 .../src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2adabaac/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
----------------------------------------------------------------------
diff --git 
a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java 
b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
index 856f6b3..cc9e9cb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
@@ -386,7 +386,7 @@ public abstract class CacheTestCase extends 
DistributedTestCase {
   public static synchronized void closeCache() {
     //Workaround for that fact that some classes are now extending
     //CacheTestCase but not using it properly.
-    if(cache == null) {
+    if(cache == null || cache.isClosed()) {
       cache = GemFireCacheImpl.getInstance();
     }
     try {

Reply via email to