You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pi...@apache.org on 2018/01/29 21:53:33 UTC

[geode] branch develop updated: GEODE-4149: Replace CacheFactory.getInstance(getSystem()) with JUnit4CacheTestCase.getCache(). (#1348)

This is an automated email from the ASF dual-hosted git repository.

pivotalsarge pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new fe3e41f  GEODE-4149: Replace CacheFactory.getInstance(getSystem()) with JUnit4CacheTestCase.getCache(). (#1348)
fe3e41f is described below

commit fe3e41fb3b344301bc5ec680fb7b78ba95a6b210
Author: Michael "Sarge" Dodge <md...@pivotal.io>
AuthorDate: Mon Jan 29 13:53:29 2018 -0800

    GEODE-4149: Replace CacheFactory.getInstance(getSystem()) with JUnit4CacheTestCase.getCache(). (#1348)
---
 .../java/org/apache/geode/cache30/MultiVMRegionTestCase.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index 1c0551e..c5479f5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -2676,7 +2676,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
           }, getRepeatTimeoutMs());
 
     } catch (Exception e) {
-      CacheFactory.getInstance(getSystem()).close();
+      getCache().close();
       getSystem().getLogWriter().fine("testDistributedPut: Caused exception in createRegion");
       throw e;
     }
@@ -6232,7 +6232,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
           }, getRepeatTimeoutMs());
 
     } catch (Exception e) {
-      CacheFactory.getInstance(getSystem()).close();
+      getCache().close();
       getSystem().getLogWriter().fine("testTXSimpleOps: Caused exception in createRegion");
       throw e;
     }
@@ -6489,7 +6489,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
       txMgr.rollback();
       assertSame(localCmtValue, rgn.getEntry("key").getValue());
     } catch (Exception e) {
-      CacheFactory.getInstance(getSystem()).close();
+      getCache().close();
       getSystem().getLogWriter()
           .fine("testTXUpdateLoadNoConflict: Caused exception in createRegion");
       throw e;
@@ -7248,7 +7248,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
       rgn2.destroyRegion();
       rgn3.destroyRegion();
     } catch (Exception e) {
-      CacheFactory.getInstance(getSystem()).close();
+      getCache().close();
       getSystem().getLogWriter().fine("testTXMultiRegion: Caused exception in createRegion");
       throw e;
     }
@@ -7386,7 +7386,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
       // Make sure that a remote put, that modifies an existing entry,
       // done in a tx is dropped in a remote mirror that does not have the entry.
     } catch (Exception e) {
-      CacheFactory.getInstance(getSystem()).close();
+      getCache().close();
       getSystem().getLogWriter().fine("textTXRmtMirror: Caused exception in createRegion");
       throw e;
     }
@@ -7859,7 +7859,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
 
 
     } catch (Exception e) {
-      CacheFactory.getInstance(getSystem()).close();
+      getCache().close();
       getSystem().getLogWriter().fine("testTXAlgebra: Caused exception in createRegion");
       throw e;
     }

-- 
To stop receiving notification emails like this one, please contact
pivotalsarge@apache.org.