[geode] 01/01: GEODE-8324: Don't add a remote ds id to recipients unless it is running

[boglesby]

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

boglesby pushed a commit to branch feature/GEODE-8324
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 514b17a5a43093c2301c5305ea356bc48924fe90
Author: Barry Oglesby <bogle...@pivotal.io>
AuthorDate: Tue Jun 30 14:44:36 2020 -0700

    GEODE-8324: Don't add a remote ds id to recipients unless it is running
---
 .../org/apache/geode/internal/cache/AbstractRegion.java  | 16 +++++++++-------
 .../geode/internal/cache/wan/AbstractGatewaySender.java  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index 0364e17..e8c73e5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -738,15 +738,17 @@ public abstract class AbstractRegion implements 
InternalRegion, AttributesMutato
     if ((sz > 0 || isPdxTypesRegion) && !allGatewaySenders.isEmpty()) {
       List<Integer> allRemoteDSIds = new ArrayList<>(sz);
       for (GatewaySender sender : allGatewaySenders) {
-        // This is for all regions except pdx Region
-        if (!isPdxTypesRegion) {
-          // Make sure we are distributing to only those senders whose id
-          // is available on this region
-          if (allGatewaySenderIds.contains(sender.getId())) {
+        if (sender.isRunning()) {
+          // This is for all regions except pdx Region
+          if (!isPdxTypesRegion) {
+            // Make sure we are distributing to only those senders whose id
+            // is available on this region
+            if (allGatewaySenderIds.contains(sender.getId())) {
+              allRemoteDSIds.add(sender.getRemoteDSId());
+            }
+          } else { // this else is for PDX region
             allRemoteDSIds.add(sender.getRemoteDSId());
           }
-        } else { // this else is for PDX region
-          allRemoteDSIds.add(sender.getRemoteDSId());
         }
       }
       return allRemoteDSIds;
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 396edca..6e4a4f3 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -1036,7 +1036,7 @@ public abstract class AbstractGatewaySender implements 
InternalGatewaySender, Di
         if (this.isPrimary()) {
           tmpDroppedEvents.add(clonedEvent);
           if (isDebugEnabled) {
-            logger.debug("add to tmpDroppedEvents for evnet {}", clonedEvent);
+            logger.debug("add to tmpDroppedEvents for event {}", clonedEvent);
           }
         }
         if (isDebugEnabled) {