fix async queries
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/QueryResultAPIServlet.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/QueryResultAPIServlet.java
index 05c9023..9c93671 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/QueryResultAPIServlet.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/QueryResultAPIServlet.java
@@ -82,6 +82,7 @@
JSONArray results = new JSONArray();
while (resultReader.read(buffer) > 0) {
ResultUtils.getJSONFromBuffer(buffer, resultReader.getFrameTupleAccessor(), results);
+ buffer.clear();
}
jsonResponse.put("results", results);
out.write(jsonResponse.toString());
diff --git a/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js b/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
index c7a60c6..8d8d8e4 100755
--- a/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
+++ b/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
@@ -455,7 +455,7 @@
asyncQueryManager[handle_id]["result"] = res;
var resultTransform = {
- "results" : res.results[0]
+ "results" : res.results
};
cherryQuerySyncCallback(resultTransform);
@@ -464,7 +464,7 @@
} else {
var resultTransform = {
- "results" : asyncQueryManager[handle_id]["result"].results[0]
+ "results" : asyncQueryManager[handle_id]["result"].results
};
cherryQuerySyncCallback(resultTransform);
@@ -492,7 +492,6 @@
* @param {Object} res, a result object from a cherry geospatial query
*/
function cherryQuerySyncCallback(res) {
-
// First, we check if any results came back in.
// If they didn't, return.
if (!res.hasOwnProperty("results")) {