[geode] branch feature/GEM-883 updated: GEODE-3967: add to secondary event isConcurrencyConflict

[zh...@apache.org]

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

zhouxj pushed a commit to branch feature/GEM-883
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEM-883 by this push:
     new e0bbd41  GEODE-3967: add to secondary event isConcurrencyConflict
e0bbd41 is described below

commit e0bbd415763842b6621866e359b7d106838b2323
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Tue Nov 21 23:21:45 2017 -0800

    GEODE-3967: add to secondary event isConcurrencyConflict
---
 .../cache/wan/serial/SerialGatewaySenderEventProcessor.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index 7ecb233..aaa12e9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -716,9 +716,10 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
         logger.info("GGG:secondary after removed:" + v + ":" + gatewayEvent);
       }
 
-      if (v == null && !gatewayEvent.isConcurrencyConflict) {
-        // only when isConcurrencyConflict is false, add the event into unprocessedEvents
-        logger.info("GGG:secondary before add to:" + gatewayEvent, new Exception());
+      if (v == null) {
+        if (gatewayEvent.isConcurrencyConflict) {
+          logger.info("GGG:secondary before add to:" + gatewayEvent, new Exception());
+        }
         // first time for the event
         if (logger.isTraceEnabled()) {
           logger.trace("{}: fromSecondary event {}:{}->{} added from unprocessed events map",

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].