diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java index 585d8cf9e83..7de4470297a 100644 --- a/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java +++ b/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java @@ -28,6 +28,7 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.rest.*; +import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.search.Scroll; import java.io.IOException; @@ -56,8 +57,8 @@ public class RestSearchScrollAction extends BaseRestHandler { @Override public void handleRequest(final RestRequest request, final RestChannel channel) { String scrollId = request.param("scroll_id"); - if (scrollId == null && request.hasContent()) { - scrollId = request.content().toUtf8(); + if (scrollId == null) { + scrollId = RestActions.getRestContent(request).toUtf8(); } SearchScrollRequest searchScrollRequest = new SearchScrollRequest(scrollId); searchScrollRequest.listenerThreaded(false);