You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2017/04/27 17:24:56 UTC

[26/26] geode git commit: fix-7

fix-7


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

Branch: refs/heads/feature/GEM-1299
Commit: 788eed117832b4dd6cbb98ffc16f0296f3ef3a5a
Parents: 003de33
Author: zhouxh <gz...@pivotal.io>
Authored: Thu Apr 27 10:23:49 2017 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Thu Apr 27 10:23:49 2017 -0700

----------------------------------------------------------------------
 .../WaitUntilParallelGatewaySenderFlushedCoordinator.java       | 2 +-
 .../cache/lucene/internal/LuceneIndexForPartitionedRegion.java  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/788eed11/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
index 1388dd0..946a09f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
 
 public class WaitUntilParallelGatewaySenderFlushedCoordinator
     extends WaitUntilGatewaySenderFlushedCoordinator {
-  final static private int CALLABLES_CHUNK_SIZE = 10;
+  final static private int CALLABLES_CHUNK_SIZE = 113;
 
   public WaitUntilParallelGatewaySenderFlushedCoordinator(AbstractGatewaySender sender,
       long timeout, TimeUnit unit, boolean initiator) {

http://git-wip-us.apache.org/repos/asf/geode/blob/788eed11/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 6e3dce0..0b9727c 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -313,7 +313,10 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
 
     private void redistributeEvents(final AsyncEvent event) {
       try {
-        logger.info("JASON unsticking event:" + event.getKey() + ":" + event);
+        logger.info("JASON unsticking event:" + event);
+        if (event == null) {
+          return;
+        }
         FunctionService.onRegion(event.getRegion())
             .withArgs(new Object[] {event.getRegion().getName(), event.getKey(), event})
             .execute(PokeLuceneAsyncQueueFunction.ID);