geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject [2/3] incubator-geode git commit: Removing statics from the lambda expressions
Date Thu, 18 Feb 2016 02:04:23 GMT
Removing statics from the lambda expressions

A bunch of tests were failing because the location in which static
fields are evaluated has changed. Before, a static in the parameter list
was evaluated on the controller. Now it is evaluated on the remote VM.

Converting the statics to fields or local variables so they are captured
and serialized.


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

Branch: refs/heads/feature/GEODE-866
Commit: 923e219f2ea8e3cd6d5baed3d585489b30c86a75
Parents: 9beed82
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Wed Feb 17 15:26:14 2016 -0800
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Wed Feb 17 18:04:11 2016 -0800

----------------------------------------------------------------------
 .../cache/CacheRegionClearStatsDUnitTest.java   |  2 +-
 .../QueryUsingFunctionContextDUnitTest.java     |  2 +-
 .../cache30/RegionReliabilityTestCase.java      | 11 +++-
 .../ConsoleDistributionManagerDUnitTest.java    |  4 +-
 .../internal/cache/Bug39079DUnitTest.java       |  2 +-
 .../internal/cache/ClearDAckDUnitTest.java      |  2 +-
 .../cache/DeltaPropagationDUnitTest.java        |  4 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |  6 +-
 .../cache/execute/Bug51193DUnitTest.java        |  2 +-
 .../ClientServerFunctionExecutionDUnitTest.java |  6 +-
 .../cache/execute/PRClientServerTestBase.java   |  2 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |  2 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  | 12 ++--
 .../internal/cache/ha/HAClearDUnitTest.java     | 19 +++----
 .../cache/ha/HAConflationDUnitTest.java         |  6 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java | 15 ++---
 .../internal/cache/ha/HAGIIDUnitTest.java       | 10 ++--
 .../cache/ha/HARQueueNewImplDUnitTest.java      |  4 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |  4 +-
 .../ha/OperationsPropagationDUnitTest.java      |  6 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |  8 +--
 .../cache/partitioned/Bug43684DUnitTest.java    |  2 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |  2 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |  2 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |  2 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |  5 +-
 .../CacheServerTransactionsDUnitTest.java       |  2 +-
 .../tier/sockets/ClientConflationDUnitTest.java |  2 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |  7 ++-
 .../cache/tier/sockets/ConflationDUnitTest.java | 29 ++++------
 .../DataSerializerPropogationDUnitTest.java     | 10 ++--
 .../DestroyEntryPropagationDUnitTest.java       | 16 +++---
 .../sockets/EventIDVerificationDUnitTest.java   | 27 +++++----
 .../EventIDVerificationInP2PDUnitTest.java      | 21 ++++---
 .../InstantiatorPropagationDUnitTest.java       |  8 +--
 .../tier/sockets/InterestListDUnitTest.java     |  7 ++-
 .../sockets/InterestListEndpointDUnitTest.java  | 42 +++++++-------
 .../sockets/InterestListFailoverDUnitTest.java  |  4 +-
 .../sockets/InterestResultPolicyDUnitTest.java  | 16 ++++--
 .../tier/sockets/RegionCloseDUnitTest.java      |  4 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |  8 +--
 .../sockets/UpdatePropagationDUnitTest.java     | 58 ++++++++------------
 .../sockets/UpdatePropagationPRDUnitTest.java   |  3 -
 ...UpdatesFromNonInterestEndPointDUnitTest.java |  4 +-
 .../management/ClientHealthStatsDUnitTest.java  |  2 +-
 .../security/ClientAuthorizationDUnitTest.java  |  6 +-
 .../security/ClientAuthorizationTestBase.java   |  6 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |  6 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java   | 19 ++++++-
 .../cache/ha/HADispatcherDUnitTest.java         | 12 ++--
 ...ToRegionRelationCQRegistrationDUnitTest.java |  4 +-
 ...rialGatewaySenderEventListenerDUnitTest.java |  5 +-
 52 files changed, 237 insertions(+), 233 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index 743887a..88a32a3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -39,7 +39,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
   /** the cache */
   private static GemFireCacheImpl cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM client1 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 2d7212e..1e3e973 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -78,7 +78,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
 
   private static final int cntDest = 100;
 
-  static VM server1 = null;
+  VM server1 = null;
 
   static VM server2 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index 07f00cd..de0451e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -67,6 +67,7 @@ import com.gemstone.gemfire.internal.cache.TXStateInterface;
 import com.gemstone.gemfire.internal.cache.TXStateProxyImpl;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 import com.gemstone.gemfire.test.dunit.ThreadUtils;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -1118,7 +1119,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
     });
     
     // define the afterReleaseLocalLocks callback
-    Runnable removeRequiredRole = new Runnable() {
+    SerializableRunnableIF removeRequiredRole = new SerializableRunnableIF() {
       public void run() {
         Host.getHost(0).getVM(1).invoke(new SerializableRunnable("Close Region") {
           public void run() {
@@ -1161,7 +1162,13 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
     TXStateInterface txStateProxy = ((TXManagerImpl)ctm).getTXState();
     ((TXStateProxyImpl)txStateProxy).forceLocalBootstrap();
     TXState txState = (TXState)((TXStateProxyImpl)txStateProxy).getRealDeal(null,null);
-    txState.setBeforeSend(removeRequiredRole);
+    txState.setBeforeSend(() -> {
+      try { 
+        removeRequiredRole.run(); 
+      } catch(Exception e) {
+        throw new RuntimeException(e);
+      }
+    });
     
     // now start a transaction and commit it
     region.put("KEY", "VAL");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index e9f8539..847edb5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -384,7 +384,7 @@ public class ConsoleDistributionManagerDUnitTest
   }
 
   private boolean acquireDistLock(VM vm, String lockName) {
-    return vm.invoke(() -> this.remoteAcquireDistLock(lockName));
+    return vm.invoke(() -> remoteAcquireDistLock(lockName));
   }
 
   /**
@@ -424,7 +424,7 @@ public class ConsoleDistributionManagerDUnitTest
   }
 
   private InternalDistributedMember getJavaGroupsIdForVM(VM vm) {
-    return (InternalDistributedMember)vm.invoke(() -> this.remoteGetJavaGroupsIdForVM());
+    return (InternalDistributedMember)vm.invoke(() -> remoteGetJavaGroupsIdForVM());
   }
   
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
index 6101520..81e603c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
@@ -62,7 +62,7 @@ public class Bug39079DUnitTest extends CacheTestCase {
   static Properties props = new Properties();
   
 
-  private static VM vm0 = null;
+  private VM vm0 = null;
 
   private static VM vm1 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
index 4c79202..7c8327e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
@@ -63,7 +63,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase {
     static CacheTransactionManager cacheTxnMgr;
     static boolean IsAfterClear=false;
     static boolean flag = false;
-    static DistributedMember vm0ID, vm1ID;
+    DistributedMember vm0ID, vm1ID;
     
     @Override
     public void setUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 7ef1a0d..b502992 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -84,9 +84,9 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
 
   protected static VM VM3 = null;
 
-  private static int PORT1;
+  private int PORT1;
 
-  private static int PORT2;
+  private int PORT2;
 
   private static final String regionName = "DeltaPropagationDUnitTest";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index e98df03..69f73ec 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -66,13 +66,13 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase {
   /* handler for LRU capacity controller */
   private static EnableLRU cc = null;
 
-  static VM client = null;
+  VM client = null;
 
   static VM serverVM = null;
 
-  static Integer serverPort1 = null;
+  Integer serverPort1 = null;
 
-  static Integer serverPort2 = null;
+  Integer serverPort2 = null;
 
   static String ePolicy = "mem";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
index 8a83417..de58569 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
@@ -59,7 +59,7 @@ public class Bug51193DUnitTest extends DistributedTestCase {
   
   private static VM server0;
   
-  private static VM client0;
+  private VM client0;
   
   @Override
   public void setUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index 800b33b..821407f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -52,9 +52,9 @@ import java.util.concurrent.Callable;
 public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBase {
   private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
 
-  static Boolean isByName = null;
-  static Function function = null;
-  static Boolean toRegister = null;
+  Boolean isByName = null;
+  Function function = null;
+  Boolean toRegister = null;
   static final String retryRegionName = "RetryDataRegion";
   static Region metaDataRegion;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index d590496..560d305 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 public class PRClientServerTestBase extends CacheTestCase {
 
-  protected static VM server1 = null;
+  protected VM server1 = null;
 
   protected static VM server2 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
index 9e03a70..e5acf27 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 public class Bug48571DUnitTest extends DistributedTestCase {
 
   private static VM server = null;
-  private static VM client = null;
+  private VM client = null;
   private static GemFireCacheImpl cache = null;
   
   private static final String region = "Bug48571DUnitTest_region";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
index 41f56cc..4adb2a8 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
@@ -58,10 +58,6 @@ public class HABugInPutDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  public static int PORT1;
-
-  public static int PORT2;
-
   private static final String REGION_NAME = "HABugInPutDUnitTest_region";
 
   final static String KEY1 = "KEY1";
@@ -91,9 +87,9 @@ public class HABugInPutDUnitTest extends DistributedTestCase
     client2 = host.getVM(3);
 
     //System.setProperty())
-    PORT1 = ((Integer)server1.invoke(() -> HABugInPutDUnitTest.createServerCache()))
+    int PORT1 = ((Integer)server1.invoke(() -> HABugInPutDUnitTest.createServerCache()))
         .intValue();
-    PORT2 = ((Integer)server2.invoke(() -> HABugInPutDUnitTest.createServerCache()))
+    int PORT2 = ((Integer)server2.invoke(() -> HABugInPutDUnitTest.createServerCache()))
         .intValue();
 
     client1.invoke(() -> HABugInPutDUnitTest.createClientCache(
@@ -151,8 +147,8 @@ public class HABugInPutDUnitTest extends DistributedTestCase
   public static void createClientCache(String hostName, Integer port1, Integer port2)
       throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
index 6a34318..bb2ca69 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
@@ -63,10 +63,6 @@ public class HAClearDUnitTest extends DistributedTestCase
 
   static VM client2 = null;
 
-  public static int PORT1;
-
-  public static int PORT2;
-
   private static final String REGION_NAME = "HAClearDUnitTest_Region";
 
   protected static Cache cache = null;
@@ -554,17 +550,18 @@ public class HAClearDUnitTest extends DistributedTestCase
   // function to create 2servers and 3 clients
   private void createClientServerConfigurationForClearTest() throws Exception
   {
-    PORT1 = ((Integer)server1.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
-    PORT2 = ((Integer)server2.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
+    int PORT1 = ((Integer)server1.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
+    int PORT2 = ((Integer)server2.invoke(() -> HAClearDUnitTest.createServerCache())).intValue();
+    String hostname = NetworkUtils.getServerHostName(Host.getHost(0));
     client1.invoke(() -> HAClearDUnitTest.createClientCache(
-        NetworkUtils.getServerHostName(Host.getHost(0)),
+        hostname,
         new Integer(PORT1), new Integer(PORT2), new Boolean(true),
         new Boolean(true) ));
     client2.invoke(() -> HAClearDUnitTest.createClientCache(
-        NetworkUtils.getServerHostName(Host.getHost(0)),
+        hostname,
         new Integer(PORT1), new Integer(PORT2), new Boolean(true),
         new Boolean(true) ));
-    createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)),
+    createClientCache(hostname,
         new Integer(PORT1), new Integer(PORT2),
         new Boolean(true), new Boolean(true));
   }
@@ -599,8 +596,8 @@ public class HAClearDUnitTest extends DistributedTestCase
   public static void createClientCache(String hostName, Integer port1, Integer port2,
       Boolean listenerAttached, Boolean registerInterest) throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     boolean isListenerAttached = listenerAttached.booleanValue();
     boolean isRegisterInterest = registerInterest.booleanValue();
     Properties props = new Properties();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
index 629f1a4..212a798 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
@@ -67,8 +67,6 @@ public class HAConflationDUnitTest extends CacheTestCase
 
   VM client1 = null;
 
-  public static int PORT1;
-
   private static final String regionName = "HAConflationDUnitTest_region";
 
   final static String KEY1 = "KEY1";
@@ -109,7 +107,7 @@ public class HAConflationDUnitTest extends CacheTestCase
     // Client 1 VM
     client1 = host.getVM(2);
 
-    PORT1 = ((Integer)server1.invoke(() -> HAConflationDUnitTest.createServerCache( new Boolean(false) ))).intValue();
+    int PORT1 = ((Integer)server1.invoke(() -> HAConflationDUnitTest.createServerCache( new Boolean(false) ))).intValue();
     server1.invoke(() -> ConflationDUnitTest.setIsSlowStart());
     server1.invoke(() -> HAConflationDUnitTest.makeDispatcherSlow());
     client1.invoke(() -> HAConflationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1), new Boolean(true) ));
@@ -311,7 +309,7 @@ public class HAConflationDUnitTest extends CacheTestCase
   public static void createClientCache(String host, Integer port1, Boolean isListenerPresent)
       throws Exception
   {
-    PORT1 = port1.intValue();
+    int PORT1 = port1.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index 4a7d5db..1d18390 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -67,10 +67,6 @@ public class HADuplicateDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  public static int PORT1;
-
-  public static int PORT2;
-
   private static final String REGION_NAME = "HADuplicateDUnitTest_Region";
 
   protected static Cache cache = null;
@@ -219,10 +215,11 @@ public class HADuplicateDUnitTest extends DistributedTestCase
   // function to create 2servers and 1 clients
   private void createClientServerConfiguration()
   {
-    PORT1 = ((Integer)server1.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
+    int PORT1 = ((Integer)server1.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
     server1.invoke(() -> HADuplicateDUnitTest.setQRMslow());
-    PORT2 = ((Integer)server2.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
-    client1.invoke(() -> HADuplicateDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) ));
+    int PORT2 = ((Integer)server2.invoke(() -> HADuplicateDUnitTest.createServerCache())).intValue();
+    String hostname = NetworkUtils.getServerHostName(Host.getHost(0));
+    client1.invoke(() -> HADuplicateDUnitTest.createClientCache( hostname, new Integer(PORT1), new Integer(PORT2) ));
 
   }
 
@@ -267,8 +264,8 @@ public class HADuplicateDUnitTest extends DistributedTestCase
   public static void createClientCache(String hostName, Integer port1, Integer port2)
       throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
index 3d62b99..4439e65 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
@@ -118,12 +118,10 @@ public class HAGIIDUnitTest extends DistributedTestCase
   private static VM server1 = null;
   private static VM client0 = null;
 
-  private static int PORT1;
-  private static int PORT2;
-
   private static final String REGION_NAME = "HAGIIDUnitTest_region";
   
   protected static GIIChecker checker = new GIIChecker();
+  private int PORT2;
 
   /** constructor */
   public HAGIIDUnitTest(String name) {
@@ -143,7 +141,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
     client0 = host.getVM(2);
 
     //start server1
-    PORT1 = ((Integer)server0.invoke(() -> HAGIIDUnitTest.createServer1Cache())).intValue();
+    int PORT1 = ((Integer)server0.invoke(() -> HAGIIDUnitTest.createServer1Cache())).intValue();
     server0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
     server0.invoke(() -> HAGIIDUnitTest.setSystemProperty());
 
@@ -181,8 +179,8 @@ public class HAGIIDUnitTest extends DistributedTestCase
 
   public static void createClientCache(String host, Integer port1 , Integer port2) throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 75c087a..91aeb98 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -81,9 +81,9 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
 
   protected static VM clientVM2 = null;
 
-  private static int PORT1;
+  private int PORT1;
 
-  private static int PORT2;
+  private int PORT2;
 
   private static final String regionName = "HARQueueNewImplDUnitTest";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index 8df3513..6d21778 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -57,9 +57,9 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
 
   private static int PORT0;
 
-  private static int PORT1;
+  private int PORT1;
 
-  private static int PORT2;
+  private int PORT2;
 
   private static final String regionName = "HASlowReceiverDUnitTest";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
index 60e154c..ae85399 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -70,12 +70,12 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
   /**
    * Port of server1
    */
-  public static int PORT1;
+  public int PORT1;
 
   /**
    * Port of server2
    */
-  public static int PORT2;
+  public int PORT2;
 
   /**
    * Name of the region
@@ -195,7 +195,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
    */
   public static void createClientCache(String host, Integer port2) throws Exception
   {
-    PORT2 = port2.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
index f23a30f..7f9e79f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
@@ -73,10 +73,10 @@ public class PutAllDUnitTest extends DistributedTestCase
   VM client2 = null;
 
   /** port of server1**/
-  public static int PORT1;
+  public int PORT1;
 
   /** port of server2**/
-  public static int PORT2;
+  public int PORT2;
 
   /** region name**/
   private static final String REGION_NAME = "PutAllDUnitTest_Region";
@@ -178,7 +178,7 @@ public class PutAllDUnitTest extends DistributedTestCase
   /** function to create client cache with HAEventIdPropagationListenerForClient2 as the listener  **/
   public static void createClientCache2(String host, Integer port1) throws Exception
   {
-    PORT1 = port1.intValue();
+    int PORT1 = port1.intValue();
     Properties props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");
@@ -209,7 +209,7 @@ public class PutAllDUnitTest extends DistributedTestCase
   /** function to create client cache **/
   public static void createClientCache1(String host, Integer port1) throws Exception
   {
-    PORT1 = port1.intValue();
+    int PORT1 = port1.intValue();
     Properties props = new Properties();
     props.setProperty("mcast-port", "0");
     props.setProperty("locators", "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index 272a3ea..d2a5cc3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -55,7 +55,7 @@ public class Bug43684DUnitTest extends DistributedTestCase {
 
   private static GemFireCacheImpl cache;
 
-  private static Host host;
+  private Host host;
 
   private static VM server1;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index ae91f21..8839f97 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -50,7 +50,7 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends
   /** the cache */
   private static Cache cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM client1 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 81693d9..5667928 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -56,7 +56,7 @@ public class Bug36457DUnitTest extends DistributedTestCase
 {
   private static Cache cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
index 0aafb77..16fab70 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -58,7 +58,7 @@ public class Bug36805DUnitTest extends DistributedTestCase
 {
   private static Cache cache = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 994da58..bd6d870 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -61,7 +61,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
   private static Cache cache = null;
 
   /** port for the cache server */
-  private static int PORT;
+  private int PORT;
 
   /** name of the test region */
   private static final String REGION_NAME = "Bug37210DUnitTest_Region";
@@ -146,10 +146,11 @@ public class Bug37210DUnitTest extends DistributedTestCase
    */
   public void testHAStatsCleanup() throws Exception
   {
+    Host host = Host.getHost(0);
     LogWriterUtils.getLogWriter().info("testHAStatsCleanup : BEGIN");
     IgnoredException.addIgnoredException("java.net.SocketException");
     IgnoredException.addIgnoredException("Unexpected IOException");
-    client.invoke(() -> Bug37210DUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) ));
+    client.invoke(() -> Bug37210DUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT) ));
     server.invoke(() -> Bug37210DUnitTest.doEntryOperations());
     
     server.invoke(() -> Bug37210DUnitTest.closeCacheClientProxyAndVerifyStats());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index d4daa39..beb1a9d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -81,7 +81,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
   
   private static Host host = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 21a920f..8a7a769 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -63,7 +63,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
   private static Cache cacheClient = null;
   private static Cache cacheFeeder = null;
   private static Cache cacheServer = null;
-  private static int PORT ;
+  private int PORT ;
   private static int poolNameCounter = 0;
   private static final String REGION_NAME1 = "ClientConflationDUnitTest_region1" ;
   private static final String REGION_NAME2 = "ClientConflationDUnitTest_region2" ;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index 3d0364c..1559506 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -125,7 +125,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
   VM vm3 = null; // client3
   */
   private static Cache cacheServer = null;
-  private static int PORT ;
+  private int PORT ;
   private static int poolNameCounter = 0;
   // Region 1 only does interest registrations with receiveValues flag set to true
   private static final String REGION_NAME1 = "ClientInterestNotifyDUnitTest_region1" ;
@@ -184,14 +184,15 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     // Server is created with notify-by-subscription (NBS) set to false.
     PORT =  createServerCache();
     
+    Host host = Host.getHost(0);
     // Create a feeder.
-    vm0.invoke(() -> ClientInterestNotifyDUnitTest.createClientCacheFeeder(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+    vm0.invoke(() -> ClientInterestNotifyDUnitTest.createClientCacheFeeder(NetworkUtils.getServerHostName(host), new Integer(PORT)));
     
     // Client 1 overrides NBS to true.
     // Client 2 "overrides" NSB to false.
     // Client 3 uses the default NBS which is false on the server.
     
-    vm1.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"));
+    vm1.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT), "ClientOn"));
     /*
     vm2.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( getServerHostName(Host.getHost(0)), new Integer(PORT), 
       DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_OFF, "ClientOff"));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index 4844ec8..6839e32 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -71,7 +71,7 @@ public class ConflationDUnitTest extends DistributedTestCase
   VM vm0 = null;
   VM vm2 = null;
   private static Cache cache = null;
-  private static int PORT ;
+  private int PORT ;
   private static final String REGION_NAME1 = "ConflationDUnitTest_region1" ;
   private static final String REGION_NAME2 = "ConflationDUnitTest_region2" ;
   final static String MARKER = "markerKey";
@@ -142,7 +142,8 @@ public class ConflationDUnitTest extends DistributedTestCase
     try {
       vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
       createClientCache1UniqueWriter ( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
-      vm2.invoke(() -> ConflationDUnitTest.createClientCache2UniqueWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      Host host = Host.getHost(0);
+      vm2.invoke(() -> ConflationDUnitTest.createClientCache2UniqueWriter( NetworkUtils.getServerHostName(host), new Integer(PORT)));
       vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery());
       vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero());
       vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero());
@@ -167,12 +168,12 @@ public class ConflationDUnitTest extends DistributedTestCase
    * two regions with a common bridgewriter
    *
    */
-  public void testTwoRegionsOneWriter()
+  public void testTwoRegionsOneWriter() throws Exception
   {
-    try {
       vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
-      createClientCache1CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
-      vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      Host host = Host.getHost(0);
+      createClientCache1CommonWriter( NetworkUtils.getServerHostName(host), new Integer(PORT));
+      vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriter( NetworkUtils.getServerHostName(host), new Integer(PORT)));
       vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery());
       vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero());
       vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero());
@@ -187,10 +188,6 @@ public class ConflationDUnitTest extends DistributedTestCase
       createMarker();
       vm2.invoke(() -> ConflationDUnitTest.waitForMarker());
       vm2.invoke(() -> ConflationDUnitTest.assertCounterSizes());
-    }
-    catch( Exception e ) {
-      Assert.fail("Test failed due to exception", e);
-    }
   }
 
 
@@ -198,13 +195,13 @@ public class ConflationDUnitTest extends DistributedTestCase
    * test more messages are not sent to client from server
    *
    */
-  public void testNotMoreMessagesSent()
+  public void testNotMoreMessagesSent() throws Exception
   {
-    try {
       vm0.invoke(() -> ConflationDUnitTest.setIsSlowStart());
-      createClientCache1CommonWriterTest3(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
+      Host host = Host.getHost(0);
+      createClientCache1CommonWriterTest3(NetworkUtils.getServerHostName(host), new Integer(PORT));
       vm2.invoke(() -> ConflationDUnitTest.createClientCache2CommonWriterTest3(
-        NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) ));
+        NetworkUtils.getServerHostName(host), new Integer(PORT) ));
       vm2.invoke(() -> ConflationDUnitTest.setClientServerObserverForBeforeInterestRecovery());
       vm2.invoke(() -> ConflationDUnitTest.setAllCountersZero());
       vm2.invoke(() -> ConflationDUnitTest.assertAllCountersZero());
@@ -221,10 +218,6 @@ public class ConflationDUnitTest extends DistributedTestCase
       vm2.invoke(() -> ConflationDUnitTest.assertCounterSizesLessThan200());
       vm0.invoke(() -> ConflationDUnitTest.getStatsOnServer());
       vm0.invoke(() -> ConflationDUnitTest.assertConflationStatus());
-    }
-    catch (Exception e) {
-      Assert.fail("Test failed due to exception", e);
-    }
   }
   /**
    * create properties for a loner VM

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index b0a2e14..4c0c296 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -68,13 +68,13 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
 
   private static VM client2 = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
-  private static VM server2 = null;
+  private VM server2 = null;
 
-  private static int PORT1 = -1;
+  private int PORT1 = -1;
 
-  private static int PORT2 = -1;
+  private int PORT2 = -1;
 
   private static int instanceCountWithAllPuts = 3;
 
@@ -857,7 +857,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
       @Override
       public void beforeSendingToServer(EventID eventID) {
         eventId = eventID;
-        client2.invoke(() -> DataSerializerPropogationDUnitTest.setEventId( eventId ));
+        client2.invoke(() -> DataSerializerPropogationDUnitTest.setEventId( eventID ));
 
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index a70284e..6ca370f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -72,8 +72,8 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
 
   VM vm3 = null;
 
-  private static  int PORT1 ;
-  private static  int PORT2;
+  private int PORT1 ;
+  private int PORT2;
   protected static Cache cache = null;
 
   private static final String REGION_NAME = "DestroyEntryPropagationDUnitTest_region";
@@ -104,8 +104,8 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
     PORT1 =  ((Integer)vm0.invoke(() -> DestroyEntryPropagationDUnitTest.createServerCache())).intValue();
     PORT2 =  ((Integer)vm1.invoke(() -> DestroyEntryPropagationDUnitTest.createServerCache())).intValue();
 
-    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)));
-    vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1),new Integer(PORT2)));
+    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)));
+    vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)));
 
   }
 
@@ -246,7 +246,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
 
     //Do a destroy on Server1 via Connection object from client1.
     // Client1 should not receive updated value while client2 should receive
-    vm2.invoke(() -> DestroyEntryPropagationDUnitTest.acquireConnectionsAndDestroyEntriesK1andK2());
+    vm2.invoke(() -> acquireConnectionsAndDestroyEntriesK1andK2());
    // pause(10000);
     //  Check if both the puts ( on key1 & key2 ) have reached the servers
     vm0.invoke(() -> DestroyEntryPropagationDUnitTest.verifyEntriesAreDestroyed());
@@ -256,7 +256,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
 
   }
 
-  public static void acquireConnectionsAndDestroyEntriesK1andK2()
+  public void acquireConnectionsAndDestroyEntriesK1andK2()
   {
     try {
       Region r1 = cache.getRegion(Region.SEPARATOR+REGION_NAME);
@@ -411,8 +411,8 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
 
   public static void createClientCache(String host, Integer port1, Integer port2) throws Exception
   {
-    PORT1 = port1.intValue();
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue();
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index a0926f2..0217361 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -180,8 +180,9 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
     CacheWriter writer = new CacheWriterAdapter() {
       public void beforeCreate(EntryEvent event)
       {
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
+        EventID eventId = ((EntryEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( eventId));
         try {
           super.beforeCreate(event);
         }
@@ -195,8 +196,9 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
       public void beforeUpdate(EntryEvent event)
       {
 
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
+        EventID eventId = ((EntryEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeUpdate(event);
         }
@@ -209,9 +211,9 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
 
       public void beforeDestroy(EntryEvent event)
       {
-
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((EntryEventImpl)event).getEventId() ));
+        EventID eventId = ((EntryEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeDestroy(event);
         }
@@ -224,9 +226,9 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
 
       public void beforeRegionDestroy(RegionEvent event)
       {
-
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
+        EventID eventId = ((RegionEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeRegionDestroy(event);
         }
@@ -239,8 +241,9 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
 
       public void beforeRegionClear(RegionEvent event)
       {
-        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
-        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData( ((RegionEventImpl)event).getEventId() ));
+        EventID eventId = ((RegionEventImpl)event).getEventId();
+        vm0.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
+        vm1.invoke(() -> EventIDVerificationDUnitTest.setEventIDData(eventId));
         try {
           super.beforeRegionClear(event);
         }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
index 2df2cf6..f33e6e1 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
@@ -290,20 +290,23 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
   public static void verifyOperations()
   {
     createEntry();
-    Boolean pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    Boolean pass;
+    verifyEventID();
     put();
-    pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    verifyEventID();
     invalidateRegion();
-    pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    verifyEventID();
     destroy();
-    pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());
+    verifyEventID();
     destroyRegion();
+    verifyEventID();   
+  }
+
+  protected static void verifyEventID() {
+    Boolean pass;
+    EventID eventId = EventIDVerificationInP2PDUnitTest.eventId;
     pass = (Boolean)vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.verifyResult(eventId));
-    assertTrue(pass.booleanValue());   
+    assertTrue(pass.booleanValue());
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 65e78d3..9438af7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -63,13 +63,13 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
 
   private static VM client2 = null;
 
-  private static VM server1 = null;
+  private VM server1 = null;
 
   private static VM server2 = null;
 
-  private static int PORT1 = -1;
+  private int PORT1 = -1;
 
-  private static int PORT2 = -1;
+  private int PORT2 = -1;
 
   private static int instanceCountWithAllPuts = 3;
 
@@ -803,7 +803,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
           new Integer(PORT1));
   
       client2
-          .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache(NetworkUtils.getServerHostName(server2.getHost()),
+          .invoke(() -> InstantiatorPropagationDUnitTest.createClientCache(NetworkUtils.getServerHostName(server1.getHost()),
                   new Integer(PORT2)));
   
       Wait.pause(3000);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 3fa3f25..50ceda7 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -112,7 +112,7 @@ public class InterestListDUnitTest extends DistributedTestCase
   VM vm2 = null;
 
   /** the server cache's port number */
-  static  int PORT1;
+  int PORT1;
 
   // using a Integer instead of String to make sure ALL_KEYS works
   // on non-String keys
@@ -223,8 +223,9 @@ public class InterestListDUnitTest extends DistributedTestCase
   {
 
     // Initialization
-    vm1.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)));
-    vm2.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1)));
+    Host host = Host.getHost(0);
+    vm1.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1)));
+    vm2.invoke(() -> InterestListDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1)));
 
     vm1.invoke(() -> InterestListDUnitTest.createEntriesK1andK2());
     vm2.invoke(() -> InterestListDUnitTest.createEntriesK1andK2());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index 5f16688..392bdd3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -62,15 +62,15 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 public class InterestListEndpointDUnitTest extends DistributedTestCase
 {
 
-  static VM server1 = null;
+  VM server1 = null;
 
   static VM server2 = null;
 
   static VM client1 = null;
 
   protected static Cache cache = null;
-  private static int PORT1;
-  private static int PORT2;
+  private int PORT1;
+  private int PORT2;
 
   private static Connection conn1 ;
   private static PoolImpl pool;
@@ -148,30 +148,30 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
   */
   public void testInterestListEndpoint()
   {
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    server2.invoke(() -> impl.createEntriesK1andK2()); // server
-    server1.invoke(() -> impl.createEntriesK1andK2()); // server
+    client1.invoke(() -> createEntriesK1andK2());
+    server2.invoke(() -> createEntriesK1andK2()); // server
+    server1.invoke(() -> createEntriesK1andK2()); // server
 
-    client1.invoke(() -> impl.registerKey1());
+    client1.invoke(() -> registerKey1());
 
-    server1.invoke(() -> impl.verifyIfNotInterestListEndpointAndThenPut());
-    server2.invoke(() -> impl.verifyIfNotInterestListEndpointAndThenPut());
-    client1.invoke(() -> impl.verifyPut());
+    server1.invoke(() -> verifyIfNotInterestListEndpointAndThenPut());
+    server2.invoke(() -> verifyIfNotInterestListEndpointAndThenPut());
+    client1.invoke(() -> verifyPut());
   }
 
   public void testInterestListEndpointAfterFailover() throws Exception
   {
     final long maxWaitTime = 20000;
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    server2.invoke(() -> impl.createEntriesK1andK2());
-    server1.invoke(() -> impl.createEntriesK1andK2());
+    client1.invoke(() -> createEntriesK1andK2());
+    server2.invoke(() -> createEntriesK1andK2());
+    server1.invoke(() -> createEntriesK1andK2());
 
-    client1.invoke(() -> impl.registerKey1());
+    client1.invoke(() -> registerKey1());
 
     boolean firstIsPrimary = isVm0Primary();
     VM primary = firstIsPrimary? server1 : server2;
 
-    primary.invoke(() -> impl.stopILEndpointServer());
+    primary.invoke(() -> stopILEndpointServer());
     Wait.pause(5000);
 
     //Since the loadbalancing policy is roundrobin & there are two servers so
@@ -210,12 +210,12 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
     });
 
     //put on stopped server
-    primary.invoke(() -> impl.put());
-    client1.invoke(() -> impl.verifyPut());
+    primary.invoke(() -> put());
+    client1.invoke(() -> verifyPut());
   }
 
 
-  public static boolean isVm0Primary() throws Exception {
+  public boolean isVm0Primary() throws Exception {
     int port = ((Integer)client1.invoke(() -> impl.getPrimaryPort())).intValue();
     return port == PORT1;
   }
@@ -232,9 +232,9 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
 
 
  public void testUpdaterThreadIsAliveForFailedEndPoint(){
-      client1.invoke(() -> impl.acquirePoolConnection());
-      client1.invoke(() -> impl.processException());
-      client1.invoke(() -> impl.verifyUpdaterThreadIsAlive());
+      client1.invoke(() -> acquirePoolConnection());
+      client1.invoke(() -> processException());
+      client1.invoke(() -> verifyUpdaterThreadIsAlive());
  }
 
  public static void acquirePoolConnection()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index 34073c2..1e98cc5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -62,8 +62,8 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
 
   VM vm3 = null;
 
-  private static int PORT1;
-  private static int PORT2;
+  private int PORT1;
+  private int PORT2;
 
   private static final String REGION_NAME = "InterestListFailoverDUnitTest_region";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index c456483..d163e29 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -59,7 +59,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
   /** the cache instance for the test */
   private static Cache cache = null;
   
-  private static int PORT   ; 
+  private int PORT   ; 
 
   private static final String REGION_NAME = "InterestResultPolicyDUnitTest_region" ;
 
@@ -126,8 +126,9 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
     Object[] objArr = new Object[2];
     objArr[0] = InterestResultPolicy.NONE;
     objArr[1] = new Integer(PREPOPULATED_ENTRIES);
+    Host host = Host.getHost(0);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     logger.fine("testPolicyNone END");
@@ -148,8 +149,9 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
     Object[] objArr = new Object[2];
     objArr[0] = InterestResultPolicy.KEYS;
     objArr[1] = new Integer(PREPOPULATED_ENTRIES);
+    Host host = Host.getHost(0);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));;
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));;
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     logger.fine("testPolicyKeys END");
@@ -170,8 +172,9 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
     Object[] objArr = new Object[2];
     objArr[0] = InterestResultPolicy.KEYS_VALUES;
     objArr[1] = new Integer(PREPOPULATED_ENTRIES);
+    Host host = Host.getHost(0);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     logger.fine("testPolicyKeyValues END");
@@ -189,6 +192,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
    */
   public void testBug35358()
   {
+    Host host = Host.getHost(0);
     LogWriter logger = getSystem().getLogWriter();
     logger.fine("testBug35358 BEGIN");
     Object[] objArr = new Object[2];
@@ -196,7 +200,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
     /* registering for 5 extra keys */
     objArr[1] = new Integer(PREPOPULATED_ENTRIES + 5);
     vm1.invoke(() -> InterestResultPolicyDUnitTest.createClientCache(
-      NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)));
+      NetworkUtils.getServerHostName(host), new Integer(PORT)));
     vm1.invoke(InterestResultPolicyDUnitTest.class, "registerInterest", objArr);
     vm1.invoke(InterestResultPolicyDUnitTest.class, "verifyResult", objArr);
     Integer cnt = (Integer)vm0.invoke(() -> InterestResultPolicyDUnitTest.getEntryCount());
@@ -285,7 +289,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
    */
   public static void createClientCache(String host, Integer port) throws Exception
   {
-    PORT = port.intValue() ;
+    int PORT = port.intValue() ;
     InterestResultPolicyDUnitTest test = new InterestResultPolicyDUnitTest(
         "temp");
     Properties props = new Properties();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 7d729a3..b925bf7 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -55,7 +55,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
 
   VM client1 = null;
 
-  private static  int PORT1 ;
+  private int PORT1 ;
 
   private static final String REGION_NAME = "RegionCloseDUnitTest_region";
 
@@ -104,7 +104,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
 
   public static void createClientCache(String host, Integer port1) throws Exception
   {
-    PORT1 = port1.intValue() ;
+    int PORT1 = port1.intValue() ;
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index fde871a..df131a9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -51,9 +51,9 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  private static  int PORT1 ;
+  private int PORT1 ;
 
-  private static  int PORT2 ;
+  private int PORT2 ;
 
   private static final String REGION_NAME = "RegisterInterestKeysDUnitTest_region";
 
@@ -146,8 +146,8 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
 
   public static void createClientCache(String host, Integer port1 , Integer port2 ) throws Exception
   {
-    PORT1 = port1.intValue() ;
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue() ;
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index bdbb838..f544e74 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -87,16 +87,14 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
 
   VM client2 = null;
 
-  private static  int PORT1 ;
+  private int PORT1 ;
 
-  private static  int PORT2 ;
+  private int PORT2 ;
 
   private static final String REGION_NAME = "UpdatePropagationDUnitTest_region";
 
   protected static Cache cache = null;
   
-  static UpdatePropagationDUnitTest impl;
-
   /** constructor */
   public UpdatePropagationDUnitTest(String name) {
     super(name);
@@ -119,11 +117,6 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
     //client 2 VM
     client2 = host.getVM(3);
     
-    createImpl();
-    for (int i=0; i<4; i++) {
-      host.getVM(i).invoke(getClass(), "createImpl", null);
-    }
-
     PORT1 =  ((Integer)server1.invoke(() -> createServerCache())).intValue();
     PORT2 =  ((Integer)server2.invoke(() -> createServerCache())).intValue();
 
@@ -136,11 +129,6 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
     IgnoredException.addIgnoredException("Unexpected IOException");
 
   }
-  
-  /** subclass support */
-  public static void createImpl() {
-    impl = new UpdatePropagationDUnitTest("temp");
-  }
 
   private void createCache(Properties props) throws Exception
   {
@@ -165,10 +153,10 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
     final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
 
     //First create entries on both servers via the two client
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    client2.invoke(() -> impl.createEntriesK1andK2());
-    client1.invoke(() -> impl.registerKeysK1andK2());
-    client2.invoke(() -> impl.registerKeysK1andK2());
+    client1.invoke(() -> createEntriesK1andK2());
+    client2.invoke(() -> createEntriesK1andK2());
+    client1.invoke(() -> registerKeysK1andK2());
+    client2.invoke(() -> registerKeysK1andK2());
     //Induce fail over of InteretsList Endpoint to Server 2 by killing server1
     
     server1.invoke(() -> UpdatePropagationDUnitTest.killServer(new Integer(PORT1)));
@@ -254,13 +242,13 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
 
     //Do a put on Server1 via Connection object from client1.
     // Client1 should not receive updated value while client2 should receive
-    client1.invoke(() -> impl.acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
+    client1.invoke(() -> acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
     //pause(5000);
     //Check if both the puts ( on key1 & key2 ) have reached the servers
-    server1.invoke(() -> impl.verifyUpdates());
-    server2.invoke(() -> impl.verifyUpdates());
+    server1.invoke(() -> verifyUpdates());
+    server2.invoke(() -> verifyUpdates());
     // verify no updates for update originator
-    client1.invoke(() -> impl.verifyNoUpdates());
+    client1.invoke(() -> verifyNoUpdates());
 
   }
 
@@ -274,10 +262,10 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
   {
     final int maxWaitTime = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
     //  First create entries on both servers via the two client
-    client1.invoke(() -> impl.createEntriesK1andK2());
-    client2.invoke(() -> impl.createEntriesK1andK2());
-    client1.invoke(() -> impl.registerKeysK1andK2());
-    client2.invoke(() -> impl.registerKeysK1andK2());
+    client1.invoke(() -> createEntriesK1andK2());
+    client2.invoke(() -> createEntriesK1andK2());
+    client1.invoke(() -> registerKeysK1andK2());
+    client2.invoke(() -> registerKeysK1andK2());
     //Induce fail over of InteretsList Endpoint to Server 2 by killing server1
     server1.invoke(() -> UpdatePropagationDUnitTest.killServer(new Integer(PORT1)));
     //Wait for 10 seconds to allow fail over. This would mean that Interstist has failed
@@ -378,16 +366,16 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
 
     //Do a put on Server1 via Connection object from client1.
     // Client1 should not receive updated value while client2 should receive
-    client1.invoke(() -> impl.acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
+    client1.invoke(() -> acquireConnectionsAndPutonK1andK2( NetworkUtils.getServerHostName(client1.getHost())));
     Wait.pause(5000);
     //Check if both the puts ( on key1 & key2 ) have reached the servers
-    server1.invoke(() -> impl.verifyUpdates());
-    server2.invoke(() -> impl.verifyUpdates());
+    server1.invoke(() -> verifyUpdates());
+    server2.invoke(() -> verifyUpdates());
     // verify updates to other client
-    client2.invoke(() -> impl.verifyUpdates());
+    client2.invoke(() -> verifyUpdates());
   }
 
-  public static void acquireConnectionsAndPutonK1andK2(String host)
+  public void acquireConnectionsAndPutonK1andK2(String host)
   {
     try {
       Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -471,8 +459,8 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
 
   public static void createClientCache(String host, Integer port1 , Integer port2 ) throws Exception
   {
-    PORT1 = port1.intValue() ;
-    PORT2 = port2.intValue();
+    int PORT1 = port1.intValue() ;
+    int PORT2 = port2.intValue();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -503,10 +491,10 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
 
   }
 
-  public static Integer createServerCache() throws Exception
+  public Integer createServerCache() throws Exception
   {
     new UpdatePropagationDUnitTest("temp").createCache(new Properties());
-    RegionAttributes attrs = impl.createCacheServerAttributes(); 
+    RegionAttributes attrs = createCacheServerAttributes(); 
     cache.createRegion(REGION_NAME, attrs);
     CacheServer server = cache.addCacheServer();
     assertNotNull(server);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
index b65b9a0..2c12c69 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
@@ -28,9 +28,6 @@ public class UpdatePropagationPRDUnitTest extends UpdatePropagationDUnitTest {
   public UpdatePropagationPRDUnitTest(String name) {
     super(name);
   }
-  public static void createImpl() {
-    impl = new UpdatePropagationPRDUnitTest("temp");
-  }
   protected RegionAttributes createCacheServerAttributes()
   {
     AttributesFactory factory = new AttributesFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index eb5637c..238a094 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -62,8 +62,8 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
 
   VM vm2 = null;
 
-  private static int PORT1;
-  private static int PORT2;
+  private int PORT1;
+  private int PORT2;
   private static final String REGION_NAME = "VerifyUpdatesFromNonInterestEndPointDUnitTest_region";
 
   private static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index 868073e..de5c07f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -75,7 +75,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
   /** name of the test region */
   private static final String REGION_NAME = "ClientHealthStatsDUnitTest_Region";
 
-  private static VM server = null;
+  private VM server = null;
 
   private static VM client = null;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
index 0cbc1aa..0e46da5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
@@ -190,8 +190,10 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
             opFlags), new Integer(expectedResult));
       }
       else {
-        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(opCode.toOrdinal()),
-                currentOp.getIndices(), new Integer(opFlags),
+        byte ordinal = opCode.toOrdinal();
+        int[] indices = currentOp.getIndices();
+        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(ordinal),
+                indices, new Integer(opFlags),
                 new Integer(expectedResult) ));
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/923e219f/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
index 09dd49b..55edaa1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
@@ -798,8 +798,10 @@ public class ClientAuthorizationTestBase extends DistributedTestCase {
             opFlags), new Integer(expectedResult));
       }
       else {
-        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(opCode.toOrdinal()),
-                currentOp.getIndices(), new Integer(opFlags),
+        byte ordinal = opCode.toOrdinal();
+        int[] indices = currentOp.getIndices();
+        clientVM.invoke(() -> ClientAuthorizationTestBase.doOp( new Byte(ordinal),
+                indices, new Integer(opFlags),
                 new Integer(expectedResult) ));
       }
     }



Mime
View raw message