From c0945831e86ddf17a573d381b9eb0b40c2e2196c Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Mon, 29 Nov 2010 13:59:30 +0200
Subject: [PATCH] Search Scroll API: Allow to provide the scroll id as the body
 of the scroll request, closes #545.

---
 .../rest/action/search/RestSearchScrollAction.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java
index 621db6c3fae..9da96445480 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java
@@ -52,7 +52,11 @@ public class RestSearchScrollAction extends BaseRestHandler {
     }
 
     @Override public void handleRequest(final RestRequest request, final RestChannel channel) {
-        SearchScrollRequest searchScrollRequest = new SearchScrollRequest(request.param("scroll_id"));
+        String scrollId = request.param("scroll_id");
+        if (scrollId == null && request.hasContent()) {
+            scrollId = request.contentAsString();
+        }
+        SearchScrollRequest searchScrollRequest = new SearchScrollRequest(scrollId);
         try {
             String scroll = request.param("scroll");
             if (scroll != null) {