You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/06/09 18:59:49 UTC

incubator-geode git commit: GEODE-1422: Removing check to skip enqueuing temp events

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1422 [created] 566eac45f


GEODE-1422: Removing check to skip enqueuing temp events

This check was performed outside of synchronizing on the lock, which
means that some events could be added to the temp events after the
check.


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

Branch: refs/heads/feature/GEODE-1422
Commit: 566eac45fc3d9228ed0d437a1a914891b0697f1b
Parents: 11e6374
Author: Dan Smith <up...@apache.org>
Authored: Thu Jun 9 11:56:58 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jun 9 11:58:44 2016 -0700

----------------------------------------------------------------------
 .../cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java   | 4 +---
 .../internal/cache/wan/parallel/ParallelGatewaySenderImpl.java   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/566eac45/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
index aa3e71c..4b708b8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
@@ -112,9 +112,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
       
       logger.info(LocalizedMessage.create(LocalizedStrings.ParallelGatewaySenderImpl_STARTED__0, this));
       
-      if (!tmpQueuedEvents.isEmpty()) {
-        enqueueTempEvents();
-      }
+      enqueueTempEvents();
     }
     finally {
       this.getLifeCycleLock().writeLock().unlock();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/566eac45/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 b313403..8f5b728 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
@@ -111,9 +111,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
       
       logger.info(LocalizedMessage.create(LocalizedStrings.ParallelGatewaySenderImpl_STARTED__0, this));
       
-      if (!tmpQueuedEvents.isEmpty()) {
-        enqueueTempEvents();
-      }
+      enqueueTempEvents();
     }
     finally {
       this.getLifeCycleLock().writeLock().unlock();