Skip to content

Commit 60d1d51

Browse files
committed
Remove bogus conditional due to a bad merge
1 parent 00c407b commit 60d1d51

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,8 @@ public void onFailure(Exception e) {
101101
}
102102

103103
public void sendFreeContext(Transport.Connection connection, long contextId, final ActionListener<SearchFreeContextResponse> listener) {
104-
if (connection.getNode().getVersion().onOrAfter(Version.V_5_6_0_UNRELEASED)) {
105-
transportService.sendRequest(connection, FREE_CONTEXT_SCROLL_ACTION_NAME, new ScrollFreeContextRequest(contextId),
106-
TransportRequestOptions.EMPTY, new ActionListenerResponseHandler<>(listener, SearchFreeContextResponse::new));
107-
} else {
108-
throw new IllegalArgumentException("can_match is not supported on pre 5.6.0 nodes");
109-
}
104+
transportService.sendRequest(connection, FREE_CONTEXT_SCROLL_ACTION_NAME, new ScrollFreeContextRequest(contextId),
105+
TransportRequestOptions.EMPTY, new ActionListenerResponseHandler<>(listener, SearchFreeContextResponse::new));
110106
}
111107

112108
public void sendCanMatch(Transport.Connection connection, final ShardSearchTransportRequest request, SearchTask task, final

0 commit comments

Comments
 (0)