Repository: asterixdb Updated Branches: refs/heads/master ca3b9b28f -> d0888e682
handle missing format parameter Change-Id: I90b6da30e2e3a52d68cdf29b0026125dca4da3e4 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1046 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Yingyi Bu <buyin...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/d0888e68 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/d0888e68 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/d0888e68 Branch: refs/heads/master Commit: d0888e682377eb1772cc4b7db5e17074c34125ef Parents: ca3b9b2 Author: Till Westmann <ti...@apache.org> Authored: Wed Aug 3 15:47:33 2016 -0700 Committer: Till Westmann <ti...@apache.org> Committed: Wed Aug 3 18:59:32 2016 -0700 ---------------------------------------------------------------------- .../asterix/api/http/servlet/QueryServiceServlet.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d0888e68/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java index f208694..d3507d8 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java @@ -215,6 +215,9 @@ public class QueryServiceServlet extends HttpServlet { } private static String getParameterValue(String content, String attribute) { + if (content == null || attribute == null) { + return null; + } int sc = content.indexOf(';'); if (sc < 0) { return null; @@ -229,6 +232,10 @@ public class QueryServiceServlet extends HttpServlet { return null; } + private static String toLower(String s) { + return s != null ? s.toLowerCase() : s; + } + private static SessionConfig.OutputFormat getFormat(String format) { if (format != null) { if (format.startsWith(MediaType.CSV.str())) { @@ -262,7 +269,7 @@ public class QueryServiceServlet extends HttpServlet { return app; }; - String formatstr = request.getParameter(Parameter.FORMAT.str()).toLowerCase(); + final String formatstr = toLower(request.getParameter(Parameter.FORMAT.str())); SessionConfig.OutputFormat format = getFormat(formatstr); SessionConfig sessionConfig = new SessionConfig(resultWriter, format, resultPrefix, resultPostfix); sessionConfig.set(SessionConfig.FORMAT_WRAPPER_ARRAY, true);
