You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2017/08/17 10:28:16 UTC
[1/6] geode git commit: GEODE-2886 : 1. sent IllegalStateException
instead of throwing IllegalArgumentException inside WaitUntilFlushedFunction.
2. Added dunit test with invalid indexName to get IllegalStateException to
the caller of the WaitUntilFlushed
Repository: geode
Updated Branches:
refs/heads/develop 2f61dd600 -> 83c19160d
GEODE-2886 : 1. sent IllegalStateException instead of throwing
IllegalArgumentException inside WaitUntilFlushedFunction.
2. Added dunit test with invalid indexName to get IllegalStateException
to the caller of the WaitUntilFlushedFunction.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/11971d51
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/11971d51
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/11971d51
Branch: refs/heads/develop
Commit: 11971d51b946804e5c01c752be95c3174fea3569
Parents: 2f61dd6
Author: Amey Barve <ab...@apache.org>
Authored: Fri Jun 23 16:18:33 2017 +0530
Committer: Amey Barve <ab...@apache.org>
Committed: Thu Aug 17 15:38:41 2017 +0530
----------------------------------------------------------------------
.../cache/lucene/internal/LuceneServiceImpl.java | 16 ++++++++++++----
.../distributed/WaitUntilFlushedFunction.java | 4 ++--
.../lucene/LuceneQueriesIntegrationTest.java | 18 ++++++++++++++++++
3 files changed, 32 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/11971d51/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index 39b5d36..258b8a4 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -473,12 +473,20 @@ public class LuceneServiceImpl implements InternalLuceneService {
new WaitUntilFlushedFunctionContext(indexName, timeout, unit);
Execution execution = FunctionService.onRegion(dataRegion);
ResultCollector rs = execution.setArguments(context).execute(WaitUntilFlushedFunction.ID);
- List<Boolean> results = (List<Boolean>) rs.getResult();
- for (Boolean oneResult : results) {
- if (oneResult == false) {
+ List<Object> results = (List<Object>) rs.getResult();
+ if (results != null) {
+ if (results.get(0) instanceof IllegalStateException) {
return false;
+ } else {
+ for (Object oneResult : results) {
+ if ((boolean) oneResult == false) {
+ return false;
+ }
+ }
+ return true;
}
+ } else {
+ return false;
}
- return true;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/11971d51/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
index bae0e74..6c14fcd 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
@@ -62,8 +62,8 @@ public class WaitUntilFlushedFunction implements Function, InternalEntity {
}
} else {
- throw new IllegalArgumentException(
- "The AEQ does not exist for the index " + indexName + " region " + region.getFullPath());
+ resultSender.sendException(new IllegalStateException(
+ "The AEQ does not exist for the index " + indexName + " region " + region.getFullPath()));
}
resultSender.lastResult(result);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/11971d51/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
index fb86e19..779b12a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -331,6 +331,24 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
}
@Test()
+ public void testWaitUntilFlushedForException() throws Exception {
+ Map<String, Analyzer> fields = new HashMap<String, Analyzer>();
+ fields.put("name", null);
+ fields.put("lastName", null);
+ fields.put("address", null);
+ luceneService.createIndexFactory().setFields(fields).create(INDEX_NAME, REGION_NAME);
+ Region region = cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
+ final LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
+
+ // This is to send IllegalStateException from WaitUntilFlushedFunction
+ String nonCreatedIndex = "index2";
+
+ boolean b =
+ luceneService.waitUntilFlushed(nonCreatedIndex, REGION_NAME, 60000, TimeUnit.MILLISECONDS);
+ assertFalse(b);
+ }
+
+ @Test()
public void shouldAllowQueryOnRegionWithStringValue() throws Exception {
luceneService.createIndexFactory().setFields(LuceneService.REGION_VALUE_FIELD)
.create(INDEX_NAME, REGION_NAME);
[5/6] geode git commit: GEODE-2886 : 1. renamed testcase name as
suggested in the PR review.'
Posted by ab...@apache.org.
GEODE-2886 : 1. renamed testcase name as suggested in the PR review.'
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/40185e8b
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/40185e8b
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/40185e8b
Branch: refs/heads/develop
Commit: 40185e8bc18e6fa36077ebd9a59bd8bc3160655e
Parents: 88abd31
Author: Amey Barve <ab...@apache.org>
Authored: Fri Jul 28 17:28:14 2017 +0530
Committer: Amey Barve <ab...@apache.org>
Committed: Thu Aug 17 15:47:30 2017 +0530
----------------------------------------------------------------------
.../apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/40185e8b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
index 779b12a..2044c68 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -331,8 +331,8 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
}
@Test()
- public void testWaitUntilFlushedForException() throws Exception {
- Map<String, Analyzer> fields = new HashMap<String, Analyzer>();
+ public void waitUntilFlushThrowsIllegalStateExceptionWhenAEQNotFound() throws Exception {
+ Map<String, Analyzer> fields = new HashMap<>();
fields.put("name", null);
fields.put("lastName", null);
fields.put("address", null);
[4/6] geode git commit: GEODE-2886 : 1. optimized imports to the
correct order and to eliminate the use of the wildcard imports after applying
style file located in `geode/etc/intellij-java-modified-google-style.xml'
Posted by ab...@apache.org.
GEODE-2886 : 1. optimized imports to the correct order and to eliminate
the use of the wildcard imports after applying style file located in
`geode/etc/intellij-java-modified-google-style.xml'
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/88abd31a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/88abd31a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/88abd31a
Branch: refs/heads/develop
Commit: 88abd31aae2ca45989d973935fe10e09f98c5cb9
Parents: 11971d5
Author: Amey Barve <ab...@apache.org>
Authored: Mon Jul 3 11:49:34 2017 +0530
Committer: Amey Barve <ab...@apache.org>
Committed: Thu Aug 17 15:47:30 2017 +0530
----------------------------------------------------------------------
.../lucene/internal/LuceneServiceImpl.java | 26 ++++++++++++--------
.../distributed/WaitUntilFlushedFunction.java | 5 ++--
2 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/88abd31a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index 258b8a4..7280d66 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -15,20 +15,18 @@
package org.apache.geode.cache.lucene.internal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import org.apache.geode.cache.lucene.LuceneIndexExistsException;
-import org.apache.geode.cache.lucene.internal.distributed.LuceneQueryFunction;
-import org.apache.geode.cache.lucene.internal.management.LuceneServiceMBean;
-import org.apache.geode.cache.lucene.internal.management.ManagementIndexListener;
-import org.apache.geode.cache.lucene.internal.results.LuceneGetPageFunction;
-import org.apache.geode.cache.lucene.internal.results.PageResults;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
@@ -41,10 +39,12 @@ import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.LuceneIndex;
+import org.apache.geode.cache.lucene.LuceneIndexExistsException;
import org.apache.geode.cache.lucene.LuceneQueryFactory;
import org.apache.geode.cache.lucene.internal.directory.DumpDirectoryFiles;
import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
import org.apache.geode.cache.lucene.internal.distributed.LuceneFunctionContext;
+import org.apache.geode.cache.lucene.internal.distributed.LuceneQueryFunction;
import org.apache.geode.cache.lucene.internal.distributed.TopEntries;
import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollector;
import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollectorManager;
@@ -52,15 +52,21 @@ import org.apache.geode.cache.lucene.internal.distributed.WaitUntilFlushedFuncti
import org.apache.geode.cache.lucene.internal.distributed.WaitUntilFlushedFunctionContext;
import org.apache.geode.cache.lucene.internal.filesystem.ChunkKey;
import org.apache.geode.cache.lucene.internal.filesystem.File;
+import org.apache.geode.cache.lucene.internal.management.LuceneServiceMBean;
+import org.apache.geode.cache.lucene.internal.management.ManagementIndexListener;
+import org.apache.geode.cache.lucene.internal.results.LuceneGetPageFunction;
+import org.apache.geode.cache.lucene.internal.results.PageResults;
import org.apache.geode.cache.lucene.internal.xml.LuceneServiceXmlGenerator;
import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.cache.extension.Extensible;
import org.apache.geode.internal.cache.CacheService;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionListener;
+import org.apache.geode.internal.cache.extension.Extensible;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
/**
* Implementation of LuceneService to create lucene index and query.
http://git-wip-us.apache.org/repos/asf/geode/blob/88abd31a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
index 6c14fcd..0fecc41 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
@@ -18,14 +18,13 @@ package org.apache.geode.cache.lucene.internal.distributed;
import java.util.concurrent.TimeUnit;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
-
import org.apache.geode.cache.Region;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
+import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.execute.ResultSender;
+import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.internal.InternalEntity;
/**
[6/6] geode git commit: GEODE-2886 : Updated testcase to fail if
expected exception is not thrown. This closes #609
Posted by ab...@apache.org.
GEODE-2886 : Updated testcase to fail if expected exception is not
thrown.
This closes #609
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/83c19160
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/83c19160
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/83c19160
Branch: refs/heads/develop
Commit: 83c19160d2b9e5f31a9ae6e48c4b5f59a271a300
Parents: 3720151
Author: Amey Barve <ab...@apache.org>
Authored: Fri Aug 11 11:07:05 2017 +0530
Committer: Amey Barve <ab...@apache.org>
Committed: Thu Aug 17 15:48:36 2017 +0530
----------------------------------------------------------------------
.../apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/83c19160/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
index 2c46b4c..de5ad76 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -21,6 +21,7 @@ import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.verifyQuery
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.HashMap;
@@ -346,6 +347,8 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
try {
result = luceneService.waitUntilFlushed(nonCreatedIndex, REGION_NAME, 60000,
TimeUnit.MILLISECONDS);
+ fail(
+ "Should have got the exception because the queue does not exist for the non created index ");
} catch (Exception ex) {
assertEquals(ex.getMessage(),
"java.lang.IllegalStateException: The AEQ does not exist for the index index2 region /index");
[2/6] geode git commit: GEODE-2886 : 1. updated to throw
IllegalStateException from WaitUntilFlushedFunction.java and corresponding
testcase change.
Posted by ab...@apache.org.
GEODE-2886 : 1. updated to throw IllegalStateException from
WaitUntilFlushedFunction.java and corresponding testcase change.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/37201519
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/37201519
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/37201519
Branch: refs/heads/develop
Commit: 37201519de5968ba265e133a92ececf0c3892bb0
Parents: a1c3fc7
Author: Amey Barve <ab...@apache.org>
Authored: Tue Aug 8 18:41:22 2017 +0530
Committer: Amey Barve <ab...@apache.org>
Committed: Thu Aug 17 15:47:30 2017 +0530
----------------------------------------------------------------------
.../internal/distributed/WaitUntilFlushedFunction.java | 4 +---
.../cache/lucene/LuceneQueriesIntegrationTest.java | 13 +++++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/37201519/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
index ca77873..6c0b8b7 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
@@ -61,10 +61,8 @@ public class WaitUntilFlushedFunction implements Function, InternalEntity {
}
} else {
- IllegalStateException illegalStateException = new IllegalStateException(
+ throw new IllegalStateException(
"The AEQ does not exist for the index " + indexName + " region " + region.getFullPath());
- logger.error(illegalStateException.getMessage());
- resultSender.lastResult(result);
}
resultSender.lastResult(result);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/37201519/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
index 2044c68..2c46b4c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -342,10 +342,15 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
// This is to send IllegalStateException from WaitUntilFlushedFunction
String nonCreatedIndex = "index2";
-
- boolean b =
- luceneService.waitUntilFlushed(nonCreatedIndex, REGION_NAME, 60000, TimeUnit.MILLISECONDS);
- assertFalse(b);
+ boolean result = false;
+ try {
+ result = luceneService.waitUntilFlushed(nonCreatedIndex, REGION_NAME, 60000,
+ TimeUnit.MILLISECONDS);
+ } catch (Exception ex) {
+ assertEquals(ex.getMessage(),
+ "java.lang.IllegalStateException: The AEQ does not exist for the index index2 region /index");
+ assertFalse(result);
+ }
}
@Test()
[3/6] geode git commit: GEODE-2886:Logged the IllegalStateException
inside WaitUntilFlushedFunction and returned the result as false.
Posted by ab...@apache.org.
GEODE-2886:Logged the IllegalStateException inside
WaitUntilFlushedFunction and returned the result as false.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a1c3fc76
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a1c3fc76
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a1c3fc76
Branch: refs/heads/develop
Commit: a1c3fc7660af757e0efbb2fe4f9911e4c81dbffc
Parents: 40185e8
Author: Amey Barve <ab...@apache.org>
Authored: Wed Aug 2 18:29:47 2017 +0530
Committer: Amey Barve <ab...@apache.org>
Committed: Thu Aug 17 15:47:30 2017 +0530
----------------------------------------------------------------------
.../cache/lucene/internal/LuceneServiceImpl.java | 16 ++++------------
.../distributed/WaitUntilFlushedFunction.java | 6 ++++--
2 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a1c3fc76/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index 7280d66..1b125ed 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -479,20 +479,12 @@ public class LuceneServiceImpl implements InternalLuceneService {
new WaitUntilFlushedFunctionContext(indexName, timeout, unit);
Execution execution = FunctionService.onRegion(dataRegion);
ResultCollector rs = execution.setArguments(context).execute(WaitUntilFlushedFunction.ID);
- List<Object> results = (List<Object>) rs.getResult();
- if (results != null) {
- if (results.get(0) instanceof IllegalStateException) {
+ List<Boolean> results = (List<Boolean>) rs.getResult();
+ for (Boolean oneResult : results) {
+ if (oneResult == false) {
return false;
- } else {
- for (Object oneResult : results) {
- if ((boolean) oneResult == false) {
- return false;
- }
- }
- return true;
}
- } else {
- return false;
}
+ return true;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a1c3fc76/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
index 0fecc41..ca77873 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
@@ -61,8 +61,10 @@ public class WaitUntilFlushedFunction implements Function, InternalEntity {
}
} else {
- resultSender.sendException(new IllegalStateException(
- "The AEQ does not exist for the index " + indexName + " region " + region.getFullPath()));
+ IllegalStateException illegalStateException = new IllegalStateException(
+ "The AEQ does not exist for the index " + indexName + " region " + region.getFullPath());
+ logger.error(illegalStateException.getMessage());
+ resultSender.lastResult(result);
}
resultSender.lastResult(result);
}