diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java index dfc81a07e893b..4792db5705b9b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java @@ -200,11 +200,7 @@ public void testPendingRefreshWithIntervalChange() throws Exception { private static void scheduleRefresh(IndexShard shard, boolean expectRefresh) { PlainActionFuture future = PlainActionFuture.newFuture(); shard.scheduledRefresh(future); - if (expectRefresh) { - assertTrue(future.actionGet()); - } else { - assertFalse(future.actionGet()); - } + assertThat(future.actionGet(), equalTo(expectRefresh)); } private void ensureNoPendingScheduledRefresh(ThreadPool threadPool) { diff --git a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java index c9cab66003358..5c212c3359abb 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java @@ -435,7 +435,7 @@ public RefreshResult refresh(String source) { @Override public void maybeRefresh(String source, ActionListener listener) throws EngineException { - ActionListener.completeWith(listener, () -> RefreshResult.NO_REFRESH); + listener.onResponse(RefreshResult.NO_REFRESH); } @Override