From c917b5ea34687a61cfc3fe91f3705128aae25322 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Wed, 17 Jul 2019 19:40:14 -0700
Subject: [PATCH] DATAGEODE-210 - Polish.

---
 .../lucene/LuceneOperationsIntegrationTests.java     | 12 ++++++++++--
 ...on-with-asynceventqueues-gatewaysenders-cache.xml |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java
index 7a4d605d..d00c4ded 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java
@@ -182,8 +182,16 @@ public class LuceneOperationsIntegrationTests {
 			LuceneService luceneService =
 				event.getApplicationContext().getBean("luceneService", LuceneService.class);
 
-			SpringUtils.safeRunOperation(() ->
-				luceneService.waitUntilFlushed("PersonTitleIndex", "/People", 15L, TimeUnit.SECONDS));
+			boolean flushed = SpringUtils.safeGetValue(() -> {
+				try {
+					return luceneService.waitUntilFlushed("PersonTitleIndex", "/People", 15L, TimeUnit.SECONDS);
+				}
+				catch (Throwable ignore) {
+					return false;
+				}
+			});
+
+			assertThat(flushed).describedAs("LuceneIndex not flushed!").isTrue();
 		}
 	}
 
diff --git a/src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml b/src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml
index 3fb3ca95..5ee00b3a 100644
--- a/src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml
+++ b/src/test/resources/region-with-asynceventqueues-gatewaysenders-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="Example" refid="REPLICATE">