Fix EQL Blocking IntegTests

Same as elastic#75083
original-brownbear · Jul 7, 2021 · 8fe8868 · 8fe8868
1 parent fef1874
commit 8fe8868
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/...ClusterTest/java/org/elasticsearch/xpack/eql/action/AbstractEqlBlockingIntegTestCase.java b/...ClusterTest/java/org/elasticsearch/xpack/eql/action/AbstractEqlBlockingIntegTestCase.java
@@ -209,18 +209,8 @@ public <Request extends ActionRequest, Response extends ActionResponse> void app
                             }
                             logger.trace("unblocking field caps on " + nodeId);
                         };
-                        final Thread originalThread = Thread.currentThread();
                         chain.proceed(task, action, request,
-                            ActionListener.wrap(
-                                resp -> {
-                                    if (originalThread == Thread.currentThread()) {
-                                        // async if we never exited the original thread
-                                        executorService.execute(() -> actionWrapper.accept(resp));
-                                    } else {
-                                        actionWrapper.accept(resp);
-                                    }
-                                },
-                                listener::onFailure)
+                            ActionListener.wrap(resp -> executorService.execute(() -> actionWrapper.accept(resp)), listener::onFailure)
                         );
                     } else {
                         chain.proceed(task, action, request, listener);