geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [11/16] incubator-geode git commit: GEODE-1241: Fixed the misspelt names in Geode WAN module
Date Wed, 17 Aug 2016 00:27:17 GMT
GEODE-1241: Fixed the misspelt names in Geode WAN module

	* CamelCased few names which were not camelCased
	* Spelling errors were fixed.
	* Improvements are still required in variable names - using meaningful names.


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

Branch: refs/heads/feature/GEODE-1781
Commit: b0757d9facbe6796279d59213b2ad2270f55a67d
Parents: 3abc3d3
Author: nabarun <nnag@pivotal.io>
Authored: Wed Aug 3 11:25:54 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Tue Aug 16 17:25:23 2016 -0700

----------------------------------------------------------------------
 .../gemfire/internal/i18n/LocalizedStrings.java |    2 +-
 .../AsyncEventQueueStatsDUnitTest.java          |    2 +-
 .../client/internal/GatewaySenderBatchOp.java   |   10 +-
 .../internal/locator/wan/LocatorDiscovery.java  |   16 +-
 .../internal/locator/wan/LocatorHelper.java     |    4 +-
 .../locator/wan/WanLocatorDiscovererImpl.java   |    6 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java |    2 +-
 .../cache/wan/GatewaySenderFactoryImpl.java     |    2 +-
 .../wan/parallel/ParallelGatewaySenderImpl.java |    2 +-
 ...RemoteSerialGatewaySenderEventProcessor.java |    6 +-
 .../cache/CacheXml70GatewayDUnitTest.java       |   32 +-
 .../cache/CacheXml80GatewayDUnitTest.java       |    8 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |   20 +-
 .../cache/wan/CacheClientNotifierDUnitTest.java |    4 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |   72 +-
 ...oncurrentParallelGatewaySenderDUnitTest.java |    8 +-
 ...allelGatewaySenderOperation_2_DUnitTest.java |   10 +-
 .../ConcurrentWANPropagation_1_DUnitTest.java   |  568 ++++++++
 .../ConcurrentWANPropagation_2_DUnitTest.java   |  448 ++++++
 .../ConcurrentWANPropogation_1_DUnitTest.java   |  568 --------
 .../ConcurrentWANPropogation_2_DUnitTest.java   |  448 ------
 .../CommonParallelGatewaySenderDUnitTest.java   |    8 +-
 ...wWANConcurrencyCheckForDestroyDUnitTest.java |    4 +-
 .../cache/wan/misc/PDXNewWanDUnitTest.java      |    2 +-
 ...dRegion_ParallelWANPersistenceDUnitTest.java |   16 +-
 ...dRegion_ParallelWANPropagationDUnitTest.java | 1063 ++++++++++++++
 ...dRegion_ParallelWANPropogationDUnitTest.java | 1065 --------------
 .../SenderWithTransportFilterDUnitTest.java     |   20 +-
 ...downAllPersistentGatewaySenderDUnitTest.java |   14 +-
 .../wan/misc/WANConfigurationJUnitTest.java     |  109 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |    2 +-
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |    6 +-
 .../cache/wan/misc/WanValidationsDUnitTest.java |   96 +-
 ...ropagationConcurrentOpsOffHeapDUnitTest.java |   44 +
 .../ParallelWANPropagationOffHeapDUnitTest.java |   43 +
 ...ropogationConcurrentOpsOffHeapDUnitTest.java |   44 -
 .../ParallelWANPropogationOffHeapDUnitTest.java |   43 -
 .../SerialWANPropagationOffHeapDUnitTest.java   |   38 +
 ...ation_PartitionedRegionOffHeapDUnitTest.java |   39 +
 .../SerialWANPropogationOffHeapDUnitTest.java   |   43 -
 ...ation_PartitionedRegionOffHeapDUnitTest.java |   43 -
 ...llelGatewaySenderQueueOverflowDUnitTest.java |   24 +-
 .../ParallelWANConflationDUnitTest.java         |    4 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |   12 +-
 ...lelWANPropagationConcurrentOpsDUnitTest.java |    4 +-
 .../ParallelWANPropagationDUnitTest.java        |    2 +-
 .../wan/parallel/ParallelWANStatsDUnitTest.java |    6 +-
 ...tewaySenderDistributedDeadlockDUnitTest.java |   12 +-
 ...rialGatewaySenderEventListenerDUnitTest.java |    4 +-
 .../SerialGatewaySenderOperationsDUnitTest.java |   10 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |   26 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |   14 +-
 .../serial/SerialWANPropagationDUnitTest.java   | 1336 ++++++++++++++++++
 .../SerialWANPropagationLoopBackDUnitTest.java  |    8 +-
 ...NPropagation_PartitionedRegionDUnitTest.java |  412 ++++++
 .../SerialWANPropagationsFeatureDUnitTest.java  |  338 +++++
 .../serial/SerialWANPropogationDUnitTest.java   | 1336 ------------------
 ...NPropogation_PartitionedRegionDUnitTest.java |  412 ------
 .../SerialWANPropogationsFeatureDUnitTest.java  |  338 -----
 .../wan/serial/SerialWANStatsDUnitTest.java     |   10 +-
 .../wan/wancommand/WANCommandTestBase.java      |   30 +-
 .../wan/wancommand/WanCommandListDUnitTest.java |   12 +-
 .../wancommand/WanCommandStatusDUnitTest.java   |    6 +-
 .../management/WANManagementDUnitTest.java      |    4 +-
 .../ClusterConfigurationDUnitTest.java          |    6 +-
 .../pulse/TestRemoteClusterDUnitTest.java       |    4 +-
 66 files changed, 4663 insertions(+), 4687 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index e9bbed9..443fe78 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -3401,7 +3401,7 @@ public class LocalizedStrings {
   public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_WITH_REMOTE_DS_ID_1_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_WITH_2_REMOTE_DS_ID = new StringId(5167, "Cannot create Gateway Sender \"{0}\" with remote ds id \"{1}\" because another cache has the same Gateway Sender defined with remote ds id \"{2}\".");
   public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_AS_PARALLEL_GATEWAY_SENDER_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_AS_SERIAL_GATEWAY_SENDER = new StringId(5168, "Cannot create Gateway Sender \"{0}\" as parallel gateway sender because another cache has the same sender as serial gateway sender");
   public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_AS_SERIAL_GATEWAY_SENDER_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_AS_PARALLEL_GATEWAY_SENDER = new StringId(5169, "Cannot create Gateway Sender \"{0}\" as serial gateway sender because another cache has the same sender as parallel gateway sender");
-  public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_WITH_IS_BACTH_CONFLATION_1_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_WITH_IS_BATCH_CONFLATION_2 = new StringId(5170, "Cannot create Gateway Sender \"{0}\" with isBatchConflationEnabled \"{1}\" because another cache has the same Gateway Sender defined with isBatchConfaltionEnabled \"{2}\"");
+  public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_WITH_IS_BACTH_CONFLATION_1_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_WITH_IS_BATCH_CONFLATION_2 = new StringId(5170, "Cannot create Gateway Sender \"{0}\" with isBatchConflationEnabled \"{1}\" because another cache has the same Gateway Sender defined with isBatchConflationEnabled \"{2}\"");
   public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_WITH_IS_PERSISTENT_ENABLED_1_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_WITH_IS_PERSISTENT_ENABLED_2 = new StringId(5171, "Cannot create Gateway Sender \"{0}\" with isPersistentEnabled \"{1}\" because another cache has the same Gateway Sender defined with isPersistentEnabled \"{2}\"");
   public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_WITH_ALERT_THRESHOLD_1_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_WITH_ALERT_THRESHOLD_2 = new StringId(5172, "Cannot create Gateway Sender \"{0}\" with alertThreshold \"{1}\" because another cache has the same Gateway Sender defined with alertThreshold \"{2}\"");
   public static final StringId GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_WITH_MANUAL_START_1_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_WITH_MANUAL_START_2 = new StringId(5173, "Cannot create Gateway Sender \"{0}\" with manual start \"{1}\" because another cache has the same Gateway Sender defined with manual start \"{2}\"");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
index ef1137b..ff62efe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
@@ -188,7 +188,7 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
    * Two regions attached to same AsyncEventQueue
    */
   @Test
-  public void testReplicatedSerialPropagationUNPorcessedEvents() throws Exception {
+  public void testReplicatedSerialPropagationUnprocessedEvents() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
 
     vm1.invoke(() -> AsyncEventQueueTestBase.createCache( lnPort ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
index ef5f816..b042da0 100755
--- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
@@ -68,15 +68,7 @@ public class GatewaySenderBatchOp {
   
   public static Object executeOn(Connection con, ExecutablePool pool)
   {
-    AbstractOp op = null;
-    //System.out.println("Version: "+con.getWanSiteVersion());
-    // [sumedh] both cases are now same; why switch-case?
-    if (Version.GFE_651.compareTo(con.getWanSiteVersion()) >= 0) {
-      op = new GatewaySenderGFEBatchOpImpl();
-    } else {
-      // Default should create a batch of server version (ACCEPTOR.VERSION)
-      op = new GatewaySenderGFEBatchOpImpl();
-    }
+    AbstractOp op = new GatewaySenderGFEBatchOpImpl();
     return pool.executeOn(con, op, true/*timeoutFatal*/);
   }
                                                                

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
index bbaed1d..0fd206e 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
@@ -57,10 +57,10 @@ public class LocatorDiscovery{
   public static final int WAN_LOCATOR_PING_INTERVAL = Integer.getInteger(
       "WANLocator.PING_INTERVAL", 10000).intValue();
 
-  public LocatorDiscovery(WanLocatorDiscoverer discoverer, DistributionLocatorId locotor,RemoteLocatorJoinRequest request,
+  public LocatorDiscovery(WanLocatorDiscoverer discoverer, DistributionLocatorId locator,RemoteLocatorJoinRequest request,
       LocatorMembershipListener locatorListener) {
     this.discoverer = discoverer;
-    this.locatorId = locotor;
+    this.locatorId = locator;
     this.request = request; 
     this.locatorListener = locatorListener;
   }
@@ -133,7 +133,7 @@ public class LocatorDiscovery{
             .requestToServer(locatorId.getHost(), locatorId.getPort(), request,
                 WanLocatorDiscoverer.WAN_LOCATOR_CONNECTION_TIMEOUT);
         if (response != null) {
-          LocatorHelper.addExchnagedLocators(response.getLocators(),
+          LocatorHelper.addExchangedLocators(response.getLocators(),
               this.locatorListener);
           logger.info(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_EXCHANGED_LOCATOR_INFORMATION_0_WITH_1,
               new Object[] { request.getLocator(), locatorId }));
@@ -163,8 +163,8 @@ public class LocatorDiscovery{
         retryAttempt++;
         continue;
       }
-      catch (ClassNotFoundException cnfe) {
-        logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_ENCOUNTERED_UNEXPECTED_EXCEPTION), cnfe);
+      catch (ClassNotFoundException classNotFoundException) {
+        logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_ENCOUNTERED_UNEXPECTED_EXCEPTION), classNotFoundException);
         break;
       }
     }
@@ -180,7 +180,7 @@ public class LocatorDiscovery{
             .requestToServer(remoteLocator.getHost(), remoteLocator.getPort(),
                 request, WanLocatorDiscoverer.WAN_LOCATOR_CONNECTION_TIMEOUT);
         if (response != null) {
-          LocatorHelper.addExchnagedLocators(response.getLocators(), this.locatorListener);
+          LocatorHelper.addExchangedLocators(response.getLocators(), this.locatorListener);
           logger.info(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_EXCHANGED_LOCATOR_INFORMATION_0_WITH_1,
               new Object[] { request.getLocator(), locatorId }));
           RemoteLocatorPingRequest pingRequest = new RemoteLocatorPingRequest(
@@ -217,8 +217,8 @@ public class LocatorDiscovery{
         retryAttempt++;
         continue;
       }
-      catch (ClassNotFoundException cnfe) {
-        logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_ENCOUNTERED_UNEXPECTED_EXCEPTION), cnfe);
+      catch (ClassNotFoundException classNotFoundException) {
+        logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_ENCOUNTERED_UNEXPECTED_EXCEPTION), classNotFoundException);
         break;
       }
       catch (InterruptedException e) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
index 1f36b12..83b6db3 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
@@ -102,8 +102,8 @@ public class LocatorHelper {
    * @param locators
    * @param locatorListener
    */
-  public static boolean addExchnagedLocators(Map<Integer, Set<DistributionLocatorId>> locators,
-      LocatorMembershipListener locatorListener) {
+  public static boolean addExchangedLocators(Map<Integer, Set<DistributionLocatorId>> locators,
+                                             LocatorMembershipListener locatorListener) {
 
     ConcurrentHashMap<Integer, Set<DistributionLocatorId>> allLocators = (ConcurrentHashMap<Integer, Set<DistributionLocatorId>>)locatorListener
         .getAllLocatorsInfo();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
index cde1e15..b6a0070 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
@@ -109,10 +109,10 @@ public class WanLocatorDiscovererImpl implements WanLocatorDiscoverer{
    */
   private void exchangeRemoteLocators(int port, DistributionConfigImpl config, LocatorMembershipListener locatorListener) {
     RemoteLocatorJoinRequest request = buildRemoteDSJoinRequest(port, config);
-    String remoteDustributedSystems = config.getRemoteLocators();
-    if (remoteDustributedSystems.length() > 0) {
+    String remoteDistributedSystems = config.getRemoteLocators();
+    if (remoteDistributedSystems.length() > 0) {
       StringTokenizer remoteLocators = new StringTokenizer(
-          remoteDustributedSystems, ",");
+          remoteDistributedSystems, ",");
       while (remoteLocators.hasMoreTokens()) {
         DistributionLocatorId remoteLocatorId = new DistributionLocatorId(
             remoteLocators.nextToken());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 0c0cb1c..2625ad2 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -762,7 +762,7 @@ public class GatewaySenderEventRemoteDispatcher implements
 
     private void shutDownAckReaderConnection() {
       Connection conn = connection;
-      //attempt to unblock the ackreader thread by shutting down the inputStream, if it was stuck on a read
+      //attempt to unblock the ackReader thread by shutting down the inputStream, if it was stuck on a read
       try {
         if (conn != null && conn.getInputStream() != null) {
           conn.getInputStream().close();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
index 3e3244e..4974c6f 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -228,7 +228,7 @@ public class GatewaySenderFactoryImpl implements
     if (this.attrs.isParallel()) {
 //      if(this.attrs.getDispatcherThreads() != 1){
 //        throw new GatewaySenderException(
-//            LocalizedStrings.GatewaySenderImpl_PARALLEL_GATEWAY_SENDER_0_CANNOT_BE_CREATED_WITH_DISPATHER_THREADS_OTHER_THAN_1
+//            LocalizedStrings.GatewaySenderImpl_PARALLEL_GATEWAY_SENDER_0_CANNOT_BE_CREATED_WITH_DISPATCHER_THREADS_OTHER_THAN_1
 //                .toLocalizedString(id));
 //      }
       if ((this.attrs.getOrderPolicy() != null)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index 8f5b728..322b1ba 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -236,7 +236,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
         originatingThreadId, getEventIdIndex());
     
     // In case of parallel as all events go through primary buckets
-    // we don't neet to generate different threadId for secondary buckets
+    // we don't need to generate different threadId for secondary buckets
     // as they will be rejected if seen at PR level itself
     
 //    boolean isPrimary = ((PartitionedRegion)getQueue().getRegion())

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
index 56f3b39..82fa585 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
@@ -37,9 +37,9 @@ public class RemoteSerialGatewaySenderEventProcessor extends
     if (logger.isDebugEnabled()) {
       logger.debug(" Creating the GatewayEventRemoteDispatcher");
     }
-    // In case of serial there is a way to create gatewaysender and attach
-    // asynceventlistener. Not sure of the use-case but there are dunit tests
-    // To make them passuncommenting the below condition
+    // In case of serial there is a way to create gatewaySender and attach
+    // asyncEventListener. Not sure of the use-case but there are dunit tests
+    // To make them pass uncommenting the below condition
     if (this.sender.getRemoteDSId() != GatewaySender.DEFAULT_DISTRIBUTED_SYSTEM_ID) {
       this.dispatcher = new GatewaySenderEventRemoteDispatcher(this);
     }else{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
index 3dfbfe9..3014b1b 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
@@ -111,10 +111,10 @@ public class CacheXml70GatewayDUnitTest extends CacheXmlTestCase {
     gatewayReceiverFactory.setEndPort(29999);
     gatewayReceiverFactory.setMaximumTimeBetweenPings(2000);
     gatewayReceiverFactory.setSocketBufferSize(1500);
-    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
-    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter1);
-    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
-    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewayTransportFilter myStreamFilter1 = new MyGatewayTransportFilter1();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamFilter1);
+    GatewayTransportFilter myStreamFilter2 = new MyGatewayTransportFilter2();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamFilter2);
     GatewayReceiver receiver1 = gatewayReceiverFactory.create();
 
     receiver1.start();
@@ -148,12 +148,12 @@ public class CacheXml70GatewayDUnitTest extends CacheXmlTestCase {
     gatewaySenderFactory.setMaximumQueueMemory(211);           
     gatewaySenderFactory.setAlertThreshold(35);
     
-    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
-    gatewaySenderFactory.addGatewayEventFilter(myeventfilter1);
-    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
-    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter1);
-    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
-    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewayEventFilter myEventFilter1 = new MyGatewayEventFilter1();
+    gatewaySenderFactory.addGatewayEventFilter(myEventFilter1);
+    GatewayTransportFilter myStreamFilter1 = new MyGatewayTransportFilter1();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamFilter1);
+    GatewayTransportFilter myStreamFilter2 = new MyGatewayTransportFilter2();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamFilter2);
     GatewaySender parallelGatewaySender = gatewaySenderFactory.create("LN", 2);
     
     testXml(cache);
@@ -184,12 +184,12 @@ public class CacheXml70GatewayDUnitTest extends CacheXmlTestCase {
     gatewaySenderFactory.setMaximumQueueMemory(200);           
     gatewaySenderFactory.setAlertThreshold(30);
     
-    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
-    gatewaySenderFactory.addGatewayEventFilter(myeventfilter1);
-    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
-    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter1);
-    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
-    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewayEventFilter myEventFilter1 = new MyGatewayEventFilter1();
+    gatewaySenderFactory.addGatewayEventFilter(myEventFilter1);
+    GatewayTransportFilter myStreamFilter1 = new MyGatewayTransportFilter1();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamFilter1);
+    GatewayTransportFilter myStreamFilter2 = new MyGatewayTransportFilter2();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamFilter2);
     GatewaySender serialGatewaySender = gatewaySenderFactory.create("LN", 2);
     
     RegionAttributesCreation attrs = new RegionAttributesCreation();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
index f229e0f..c140ebc 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
@@ -59,10 +59,10 @@ public class CacheXml80GatewayDUnitTest extends CacheXmlTestCase {
     gatewayReceiverFactory.setMaximumTimeBetweenPings(2000);
     gatewayReceiverFactory.setSocketBufferSize(1500);
     gatewayReceiverFactory.setManualStart(true);
-    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
-    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter1);
-    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
-    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewayTransportFilter myStreamFilter1 = new MyGatewayTransportFilter1();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamFilter1);
+    GatewayTransportFilter myStreamFilter2 = new MyGatewayTransportFilter2();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamFilter2);
     GatewayReceiver receiver1 = gatewayReceiverFactory.create();
     try {
       receiver1.start();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index f076aef..a1aec80 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -742,11 +742,11 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
         fact.addGatewaySenderId(senderId);
       }
     }
-    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
-    pfact.setTotalNumBuckets(totalNumBuckets);
-    pfact.setRedundantCopies(redundantCopies);
-    pfact.setRecoveryDelay(0);
-    fact.setPartitionAttributes(pfact.create());
+    PartitionAttributesFactory pFact = new PartitionAttributesFactory();
+    pFact.setTotalNumBuckets(totalNumBuckets);
+    pFact.setRedundantCopies(redundantCopies);
+    pFact.setRecoveryDelay(0);
+    fact.setPartitionAttributes(pFact.create());
     Region r = cache.createRegionFactory(fact.create()).create(regionName);
     assertNotNull(r);
   }
@@ -803,7 +803,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
   public static void createConcurrentSender(String dsName, int remoteDsId,
       boolean isParallel, Integer maxMemory,
       Integer batchSize, boolean isConflation, boolean isPersistent,
-      GatewayEventFilter filter, boolean isManulaStart, int concurrencyLevel) {
+      GatewayEventFilter filter, boolean isManualStart, int concurrencyLevel) {
     File persistentDirectory = new File(dsName +"_disk_"+System.currentTimeMillis()+"_" + VM.getCurrentVMNum());
     persistentDirectory.mkdir();
     DiskStoreFactory dsf = cache.createDiskStoreFactory();
@@ -814,7 +814,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
       gateway.setParallel(true);
       gateway.setMaximumQueueMemory(maxMemory);
       gateway.setBatchSize(batchSize);
-      gateway.setManualStart(isManulaStart);
+      gateway.setManualStart(isManualStart);
       ((InternalGatewaySenderFactory)gateway).setLocatorDiscoveryCallback(new MyLocatorCallback());
       if (filter != null) {
         gateway.addGatewayEventFilter(filter);
@@ -834,7 +834,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
       GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
       gateway.setMaximumQueueMemory(maxMemory);
       gateway.setBatchSize(batchSize);
-      gateway.setManualStart(isManulaStart);
+      gateway.setManualStart(isManualStart);
       ((InternalGatewaySenderFactory)gateway).setLocatorDiscoveryCallback(new MyLocatorCallback());
       if (filter != null) {
         gateway.addGatewayEventFilter(filter);
@@ -871,7 +871,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
       receiver.start();
     } catch (IOException e) {
       e.printStackTrace();
-      fail("Test " + test.getName() + " failed to start GatewayRecevier on port " + port);
+      fail("Test " + test.getName() + " failed to start GatewayReceiver on port " + port);
     }
     return port;
   }
@@ -942,7 +942,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
         return s;
       }
     }
-    //if none of the senders matches with the supplied senderid, return null
+    //if none of the senders matches with the supplied senderId, return null
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
index 24b3a40..96d441c 100755
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
@@ -171,7 +171,7 @@ public class CacheClientNotifierDUnitTest extends WANTestBase {
   }
 
   public void doMultipleCacheServer(boolean durable) throws Exception {
-    /* test senario: */
+    /* test scenario: */
     /* create 1 GatewaySender on vm0 */
     /* create 1 GatewayReceiver on vm1 */
     /* create 2 cache servers on vm1, one with overflow. */
@@ -183,7 +183,7 @@ public class CacheClientNotifierDUnitTest extends WANTestBase {
     // create sender at ln
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     
-    // create recever and cache servers will be at ny
+    // create receiver and cache servers will be at ny
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
     vm1.invoke(() -> WANTestBase.createCache( nyPort ));
     int receiverPort = vm1.invoke(() -> WANTestBase.createReceiver());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 79648e1..fd2c0b5 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -381,7 +381,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     }
     catch (IOException e) {
       e.printStackTrace();
-      com.gemstone.gemfire.test.dunit.Assert.fail("Failed to start GatewayRecevier on port " + port, e);
+      com.gemstone.gemfire.test.dunit.Assert.fail("Failed to start GatewayReceiver on port " + port, e);
     }
     return port;
   }
@@ -1204,7 +1204,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     assertTrue(gatewayReceiverStats.getEventsReceived()>= eventsReceived);
   }
 
-  public static void checkExcepitonStats(int exceptionsOccured) {
+  public static void checkExceptionStats(int exceptionsOccurred) {
     Set<GatewayReceiver> gatewayReceivers = cache.getGatewayReceivers();
     GatewayReceiver receiver = gatewayReceivers.iterator().next();
     CacheServerStats stats = ((CacheServerImpl)receiver.getServer())
@@ -1212,12 +1212,12 @@ public class WANTestBase extends JUnit4DistributedTestCase {
 
     assertTrue(stats instanceof GatewayReceiverStats);
     GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats)stats;
-    if (exceptionsOccured == 0) {
-      assertEquals(exceptionsOccured, gatewayReceiverStats
+    if (exceptionsOccurred == 0) {
+      assertEquals(exceptionsOccurred, gatewayReceiverStats
           .getExceptionsOccured());
     }
     else {
-      assertTrue(gatewayReceiverStats.getExceptionsOccured() >= exceptionsOccured);
+      assertTrue(gatewayReceiverStats.getExceptionsOccured() >= exceptionsOccurred);
     }
   }
 
@@ -1296,7 +1296,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
   }
 
   public static void checkBatchStats(String senderId,
-      final boolean batchesDistributed, final boolean bathcesRedistributed) {
+      final boolean batchesDistributed, final boolean batchesRedistributed) {
     Set<GatewaySender> senders = cache.getGatewaySenders();
     GatewaySender sender = null;
     for (GatewaySender s : senders) {
@@ -1308,7 +1308,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     final GatewaySenderStats statistics = ((AbstractGatewaySender)sender)
         .getStatistics();
     assertEquals(batchesDistributed, (statistics.getBatchesDistributed() > 0));
-    assertEquals(bathcesRedistributed,
+    assertEquals(batchesRedistributed,
         (statistics.getBatchesRedistributed() > 0));
   }
 
@@ -1378,7 +1378,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
       secondaryUpdatesMap.put("Create", listener1.createList);
       secondaryUpdatesMap.put("Update", listener1.updateList);
       secondaryUpdatesMap.put("Destroy", listener1.destroyList);
-      assertEquals("Expected seconadry map to be " + primaryUpdatesMap + " but it is " + secondaryUpdatesMap,
+      assertEquals("Expected secondary map to be " + primaryUpdatesMap + " but it is " + secondaryUpdatesMap,
         true,secondaryUpdatesMap.equals(primaryUpdatesMap));
     });
   }
@@ -1716,13 +1716,13 @@ public class WANTestBase extends JUnit4DistributedTestCase {
   }
 
   public static void createSenderWithoutDiskStore(String dsName, int remoteDsId, Integer maxMemory,
-      Integer batchSize, boolean isConflation, boolean isManulaStart) {
+      Integer batchSize, boolean isConflation, boolean isManualStart) {
 
       GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
       gateway.setParallel(true);
       gateway.setMaximumQueueMemory(maxMemory);
       gateway.setBatchSize(batchSize);
-      gateway.setManualStart(isManulaStart);
+      gateway.setManualStart(isManualStart);
       //set dispatcher threads
       gateway.setDispatcherThreads(numDispatcherThreadsForTheRun);
       gateway.setBatchConflationEnabled(isConflation);
@@ -1746,8 +1746,8 @@ public class WANTestBase extends JUnit4DistributedTestCase {
   public static void createSenderForValidations(String dsName, int remoteDsId,
       boolean isParallel, Integer alertThreshold,
       boolean isConflation, boolean isPersistent,
-      List<GatewayEventFilter> eventfilters,
-      List<GatewayTransportFilter> tranportFilters, boolean isManulaStart,
+      List<GatewayEventFilter> eventFilters,
+      List<GatewayTransportFilter> transportFilters, boolean isManualStart,
       boolean isDiskSync) {
     IgnoredException exp1 = IgnoredException.addIgnoredException(RegionDestroyedException.class
         .getName());
@@ -1764,13 +1764,13 @@ public class WANTestBase extends JUnit4DistributedTestCase {
         gateway.setAlertThreshold(alertThreshold);
         ((InternalGatewaySenderFactory)gateway)
             .setLocatorDiscoveryCallback(new MyLocatorCallback());
-        if (eventfilters != null) {
-          for (GatewayEventFilter filter : eventfilters) {
+        if (eventFilters != null) {
+          for (GatewayEventFilter filter : eventFilters) {
             gateway.addGatewayEventFilter(filter);
           }
         }
-        if (tranportFilters != null) {
-          for (GatewayTransportFilter filter : tranportFilters) {
+        if (transportFilters != null) {
+          for (GatewayTransportFilter filter : transportFilters) {
             gateway.addGatewayTransportFilter(filter);
           }
         }
@@ -1785,7 +1785,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
         }
         gateway.setDiskSynchronous(isDiskSync);
         gateway.setBatchConflationEnabled(isConflation);
-        gateway.setManualStart(isManulaStart);
+        gateway.setManualStart(isManualStart);
         //set dispatcher threads
         gateway.setDispatcherThreads(numDispatcherThreadsForTheRun);
         gateway.create(dsName, remoteDsId);
@@ -1794,18 +1794,18 @@ public class WANTestBase extends JUnit4DistributedTestCase {
       else {
         GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
         gateway.setAlertThreshold(alertThreshold);
-        gateway.setManualStart(isManulaStart);
+        gateway.setManualStart(isManualStart);
         //set dispatcher threads
         gateway.setDispatcherThreads(numDispatcherThreadsForTheRun);
         ((InternalGatewaySenderFactory)gateway)
             .setLocatorDiscoveryCallback(new MyLocatorCallback());
-        if (eventfilters != null) {
-          for (GatewayEventFilter filter : eventfilters) {
+        if (eventFilters != null) {
+          for (GatewayEventFilter filter : eventFilters) {
             gateway.addGatewayEventFilter(filter);
           }
         }
-        if (tranportFilters != null) {
-          for (GatewayTransportFilter filter : tranportFilters) {
+        if (transportFilters != null) {
+          for (GatewayTransportFilter filter : transportFilters) {
             gateway.addGatewayTransportFilter(filter);
           }
         }
@@ -1901,7 +1901,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
   public static void createSenderWithListener(String dsName, int remoteDsName,
       boolean isParallel, Integer maxMemory,
       Integer batchSize, boolean isConflation, boolean isPersistent,
-      GatewayEventFilter filter, boolean attachTwoListeners, boolean isManulaStart) {
+      GatewayEventFilter filter, boolean attachTwoListeners, boolean isManualStart) {
     File persistentDirectory = new File(dsName + "_disk_"
         + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
     persistentDirectory.mkdir();
@@ -1914,7 +1914,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
       gateway.setParallel(true);
       gateway.setMaximumQueueMemory(maxMemory);
       gateway.setBatchSize(batchSize);
-      gateway.setManualStart(isManulaStart);
+      gateway.setManualStart(isManualStart);
       //set dispatcher threads
       gateway.setDispatcherThreads(numDispatcherThreadsForTheRun);
       ((InternalGatewaySenderFactory)gateway)
@@ -1938,7 +1938,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
           .createGatewaySenderFactory();
       gateway.setMaximumQueueMemory(maxMemory);
       gateway.setBatchSize(batchSize);
-      gateway.setManualStart(isManulaStart);
+      gateway.setManualStart(isManualStart);
       //set dispatcher threads
       gateway.setDispatcherThreads(numDispatcherThreadsForTheRun);
       ((InternalGatewaySenderFactory)gateway)
@@ -1985,7 +1985,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     catch (IOException e) {
       e.printStackTrace();
       Assert.fail("Test " + getTestMethodName()
-          + " failed to start GatewayRecevier on port " + port, e);
+          + " failed to start GatewayReceiver on port " + port, e);
     }
     return port;
   }
@@ -2009,16 +2009,16 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     GatewayReceiver receiver = fact.create();
     try {
       receiver.start();
-      fail("Expected GatewayReciever Exception");
+      fail("Expected GatewayReceiver Exception");
     }
     catch (GatewayReceiverException gRE){
-      LogWriterUtils.getLogWriter().fine("KBKBKB : got the GatewayReceiverException", gRE);
+      LogWriterUtils.getLogWriter().fine("Got the GatewayReceiverException", gRE);
       assertTrue(gRE.getMessage().contains("Failed to create server socket on"));
     }
     catch (IOException e) {
       e.printStackTrace();
       fail("Test " + test.getName()
-          + " failed to start GatewayRecevier on port " + port);
+          + " failed to start GatewayReceiver on port " + port);
     }
   }
   public static int createReceiverWithSSL(int locPort) {
@@ -2063,7 +2063,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     catch (IOException e) {
       e.printStackTrace();
       fail("Test " + test.getName()
-          + " failed to start GatewayRecevier on port " + port);
+          + " failed to start GatewayReceiver on port " + port);
     }
     return port;
   }
@@ -2089,7 +2089,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     catch (IOException e) {
       e.printStackTrace();
       fail("Test " + test.getName()
-          + " failed to start GatewayRecevier on port " + receiverPort);
+          + " failed to start GatewayReceiver on port " + receiverPort);
     }
     CacheServer server = cache.addCacheServer();
     int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@ -2185,7 +2185,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     catch (IOException e) {
       e.printStackTrace();
       fail("Test " + test.getName()
-          + " failed to start GatewayRecevier on port " + port);
+          + " failed to start GatewayReceiver on port " + port);
     }
     return port;
   }
@@ -2367,7 +2367,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
       CustId custid = new CustId(i);
       int oid = i + 1;
       OrderId orderId = new OrderId(oid, custid);
-      Order order = new Order("OREDR" + oid);
+      Order order = new Order("ORDER" + oid);
       try {
         orderRegion.put(orderId, order);
         orderKeyValues.put(orderId, order);
@@ -2391,7 +2391,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     Map orderKeyValues = new HashMap();
     for (int i = 1; i <= numPuts; i++) {
       CustId custid = new CustId(i);
-      Order order = new Order("OREDR" + i);
+      Order order = new Order("ORDER" + i);
       try {
         orderRegion.put(custid, order);
         orderKeyValues.put(custid, order);
@@ -2416,7 +2416,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
       CustId custid = new CustId(i);
       int oid = i + 1;
       OrderId orderId = new OrderId(oid, custid);
-      Order order = new Order("OREDR" + oid + "_update");
+      Order order = new Order("ORDER" + oid + "_update");
       try {
         orderRegion.put(orderId, order);
         orderKeyValues.put(orderId, order);
@@ -2440,7 +2440,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
     Map orderKeyValues = new HashMap();
     for (int i = 1; i <= numPuts; i++) {
       CustId custid = new CustId(i);
-      Order order =new Order("OREDR" + i + "_update");
+      Order order =new Order("ORDER" + i + "_update");
       try {
         orderRegion.put(custid, order);
         assertTrue(orderRegion.containsKey(custid));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index ee9edf8..19edd7d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -104,7 +104,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
     vm7.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
     
     try {
-      // set the test hook to find out dispacthed events by each of the
+      // set the test hook to find out dispatched events by each of the
       // concurrent dispatcher
       vm4.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.TRUE ));
       vm5.invoke(() -> ConcurrentParallelGatewaySenderDUnitTest.setTestHook("ln", Boolean.TRUE ));
@@ -203,7 +203,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
    * @throws Exception
    */
   @Test
-  public void testParallelPropagationWithUnEqualBucketDivison() throws Exception {
+  public void testParallelPropagationWithUnEqualBucketDivision() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
@@ -322,10 +322,10 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
   }
   
   /**
-   * Testing for colocated region with orderpolicy Partition
+   * Testing for colocated region with orderPolicy Partition
    */
   @Test
-  public void testParallelPropogationColocatedPartitionedRegions() {
+  public void testParallelPropagationColocatedPartitionedRegions() {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
     Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index 106ab4b..41f01f3 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -62,7 +62,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
   }
   
   // to test that when userPR is locally destroyed, shadow Pr is also locally
-  // destroyed and on recreation usrePr , shadow Pr is also recreated.
+  // destroyed and on recreation userPr , shadow Pr is also recreated.
   @Test
   public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
@@ -186,7 +186,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
   }
 
   @Test
-  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
+  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultaneousPut_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
     Integer nyPort = locatorPorts[1];
@@ -273,7 +273,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
   }
   
   @Test
-  public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_RecreateRegion() throws Exception {
+  public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultaneousPut_RecreateRegion() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
     Integer nyPort = locatorPorts[1];
@@ -419,7 +419,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
   }
   
   @Test
-  public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate() throws Exception {
+  public void testParallelGatewaySenders_MultipleNode_UserPR_localDestroy_Recreate() throws Exception {
     Integer[] locatorPorts = createLNAndNYLocators();
     Integer lnPort = locatorPorts[0];
     Integer nyPort = locatorPorts[1];
@@ -532,7 +532,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
         assertTrue(ex.getCause() instanceof IllegalStateException);
         return;
       }
-      fail("Excpeted UnsupportedOperationException");
+      fail("Expected UnsupportedOperationException");
     } finally {
       vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
       vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0757d9f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
new file mode 100644
index 0000000..ead62e0
--- /dev/null
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
@@ -0,0 +1,568 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EntryExistsException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.wan.BatchException70;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+
+/**
+ * All the test cases are similar to SerialWANPropagationDUnitTest except that
+ * the we create concurrent serial GatewaySender with concurrency of 4
+ *
+ */
+@Category(DistributedTest.class)
+public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
+
+  /**
+   * @param name
+   */
+  public ConcurrentWANPropagation_1_DUnitTest() {
+    super();
+  }
+
+  private static final long serialVersionUID = 1L;
+  
+  /**
+   * All the test cases are similar to SerialWANPropagationDUnitTest
+   * @throws Exception
+   */
+  @Test
+  public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    //keep the batch size high enough to reduce the number of exceptions in the log
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY ));
+
+    startSenderInVMs("ln", vm4, vm5);
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    
+    IgnoredException.addIgnoredException(BatchException70.class.getName());
+    IgnoredException.addIgnoredException(ServerOperationException.class.getName());
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
+
+    createCacheInVMs(nyPort, vm2, vm3);
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", null, isOffHeap() ));
+  
+    vm2.invoke(() -> WANTestBase.createReceiver());
+    vm3.invoke(() -> WANTestBase.createReceiver());
+    
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+  }
+  
+  @Test
+  public void testReplicatedSerialPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createCacheInVMs(nyPort, vm2, vm3);
+    createReceiverInVMs(vm2, vm3);
+
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    startSenderInVMs("ln", vm4, vm5);
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+  }
+  
+  
+  @Test
+  public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throws Exception {
+    IgnoredException.addIgnoredException("Broken pipe");
+    IgnoredException.addIgnoredException("Connection reset");
+    IgnoredException.addIgnoredException("Unexpected IOException");
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createCacheInVMs(nyPort, vm2, vm3);
+    createReceiverInVMs(vm2, vm3);
+
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", null, isOffHeap() ));
+
+    startSenderInVMs("ln", vm4, vm5);
+
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+        1000 ));
+    
+    //---------close local site and build again-----------------------------------------
+    vm4.invoke(() -> WANTestBase.killSender( ));
+    vm5.invoke(() -> WANTestBase.killSender( ));
+    vm6.invoke(() -> WANTestBase.killSender( ));
+    vm7.invoke(() -> WANTestBase.killSender( ));
+    
+    Integer regionSize = 
+      (Integer) vm2.invoke(() -> WANTestBase.getRegionSize(getTestMethodName() + "_RR" ));
+    LogWriterUtils.getLogWriter().info("Region size on remote is: " + regionSize);
+
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD ));
+    
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
+
+    startSenderInVMs("ln", vm4, vm5);
+
+    vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+    
+    IgnoredException.addIgnoredException(EntryExistsException.class.getName());
+    IgnoredException.addIgnoredException(BatchException70.class.getName());
+    IgnoredException.addIgnoredException(ServerOperationException.class.getName());
+    
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
+      1000 ));
+    //----------------------------------------------------------------------------------
+
+    //verify remote site receives all the events
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR", 1000 ));
+  }
+  
+  /**
+   * Two regions configured with the same sender and put is in progress 
+   * on both the regions.
+   * One of the two regions is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  @Test
+  public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    //these are part of remote site
+    createCacheInVMs(nyPort, vm2, vm3);
+    createReceiverInVMs(vm2, vm3);
+    //these are part of local site
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    //senders are created on local site
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 20, false, false, null, true, 3, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 20, false, false, null, true ,3, OrderPolicy.THREAD));
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+
+    //create another RR (RR_2) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    
+    //start the senders on local site
+    startSenderInVMs("ln", vm4, vm5);
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+
+    //create another RR (RR_2) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
+    //do puts in RR_2 in main thread
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 500 ));
+    //destroy RR_2 after above puts are complete
+    vm4.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_2"));
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    //sleep for some time to let all the events propagate to remote site
+    Thread.sleep(20);
+    //vm4.invoke(() -> WANTestBase.verifyQueueSize( "ln", 0 ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 1000 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_2", 500 ));
+  }
+
+  /**
+   * 1 region and sender configured on local site and 1 region and a 
+   * receiver configured on remote site. Puts to the local region are in progress.
+   * Remote region is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  @Test
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    //these are part of remote site
+    createCacheInVMs(nyPort, vm2, vm3);
+    createReceiverInVMs(vm2, vm3);
+
+
+    //these are part of local site
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    //senders are created on local site
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY ));
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+
+    //start the senders on local site
+    startSenderInVMs("ln", vm4, vm5);
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+
+    IgnoredException.addIgnoredException(BatchException70.class.getName());
+    IgnoredException.addIgnoredException(ServerOperationException.class.getName());
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 10000 ));
+    //destroy RR_1 in remote site
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_1"));
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    //verify that all is well in local site. All the events should be present in local region
+    vm4.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 10000 ));
+    //assuming some events might have been dispatched before the remote region was destroyed,
+    //sender's region queue will have events less than 1000 but the queue will not be empty.
+    //NOTE: this much verification might be sufficient in DUnit. Hydra will take care of 
+    //more in depth validations.
+    vm4.invoke(() -> WANTestBase.verifyRegionQueueNotEmptyForConcurrentSender("ln" ));
+  }
+  
+  /**
+   * Two regions configured in local with the same sender and put is in progress 
+   * on both the regions. Same two regions are configured on remote site as well.
+   * One of the two regions is destroyed in the middle on remote site.
+   * 
+   * @throws Exception
+   */
+  @Test
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    //these are part of remote site
+    createCacheInVMs(nyPort, vm2, vm3);
+    createReceiverInVMs(vm2, vm3);
+
+    //these are part of local site
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    //senders are created on local site
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+
+    //create another RR (RR_2) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    
+    //start the senders on local site
+    startSenderInVMs("ln", vm4, vm5);
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+
+    //create another RR (RR_2) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", "ln", isOffHeap() ));
+    //destroy RR_2 on remote site in the middle
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_2"));
+    
+    //expected exceptions in the logs
+    IgnoredException.addIgnoredException(BatchException70.class.getName());
+    IgnoredException.addIgnoredException(ServerOperationException.class.getName());
+    
+    //start puts in RR_2 in another thread
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 1000 ));
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
+   
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    //though region RR_2 is destroyed, RR_1 should still get all the events put in it 
+    //in local site
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        getTestMethodName() + "_RR_1", 1000 ));
+
+  }
+
+  @Test
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
+      throws Exception {
+    final String senderId = "ln";
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+    // these are part of remote site
+    createCacheInVMs(nyPort, vm2, vm3);
+    createReceiverInVMs(vm2, vm3);
+
+    // these are part of local site
+    createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+    // senders are created on local site
+    vm4.invoke(() -> WANTestBase.createConcurrentSender(  senderId, 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( senderId, 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD ));
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", null, isOffHeap() ));
+
+    // create another RR (RR_2) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", null, isOffHeap() ));
+
+
+    // start the senders on local site
+    startSenderInVMs("ln", vm4, vm5);
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", senderId, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", senderId, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", senderId, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_1", senderId, isOffHeap() ));
+
+    // create another RR (RR_2) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", senderId, isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", senderId, isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", senderId, isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        getTestMethodName() + "_RR_2", senderId, isOffHeap() ));
+
+    IgnoredException.addIgnoredException(BatchException70.class.getName());
+    IgnoredException.addIgnoredException(ServerOperationException.class.getName());
+
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
+    // start puts in RR_2 in another thread
+    AsyncInvocation inv2 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_2", 1000 ));
+    // destroy RR_2 on remote site in the middle
+    vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName()
+        + "_RR_2" ));
+
+    try {
+      inv1.join();
+      inv2.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    // though region RR_2 is destroyed, RR_1 should still get all the events put
+    // in it
+    // in local site
+    try {
+      vm2.invoke(() -> WANTestBase.validateRegionSize(
+          getTestMethodName() + "_RR_1", 1000 ));
+    } finally {
+      System.setProperty(
+          DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+      vm4.invoke(new CacheSerializableRunnable("UnSetting system property ") {
+        public void run2() throws CacheException {
+          System.setProperty(
+              DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+        }
+      });
+
+      vm5.invoke(new CacheSerializableRunnable("UnSetting system property ") {
+        public void run2() throws CacheException {
+          System.setProperty(
+              DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+        }
+      });
+    }
+  }
+
+}


Mime
View raw message