Repository: tajo Updated Branches: refs/heads/branch-0.11.0 0e0c50170 -> d49a56feb
TAJO-1873: Fix NPE in QueryExecutorServlet. Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d49a56fe Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d49a56fe Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d49a56fe Branch: refs/heads/branch-0.11.0 Commit: d49a56febc93a268edad0d8047bf38d20e375db7 Parents: 0e0c501 Author: Jinho Kim <[email protected]> Authored: Tue Sep 22 12:03:21 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Tue Sep 22 12:03:21 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../src/main/java/org/apache/tajo/client/ResultSetUtil.java | 3 +-- .../main/java/org/apache/tajo/webapp/QueryExecutorServlet.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/d49a56fe/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d50037a..20f11db 100644 --- a/CHANGES +++ b/CHANGES @@ -273,6 +273,8 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1873: Fix NPE in QueryExecutorServlet. (jinho) + TAJO-1871: '-DskipTests' flag does not work. (jihoon) TAJO-1869: Incorrect result when sorting table with small files. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/d49a56fe/tajo-client/src/main/java/org/apache/tajo/client/ResultSetUtil.java ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/java/org/apache/tajo/client/ResultSetUtil.java b/tajo-client/src/main/java/org/apache/tajo/client/ResultSetUtil.java index 248de76..b2e00be 100644 --- a/tajo-client/src/main/java/org/apache/tajo/client/ResultSetUtil.java +++ b/tajo-client/src/main/java/org/apache/tajo/client/ResultSetUtil.java @@ -43,8 +43,7 @@ public class ResultSetUtil { while (res.next()) { for (int i = 1; i <= numOfColumns; i++) { if (i > 1) sb.append(", "); - String columnValue = res.getObject(i).toString(); - sb.append(columnValue); + sb.append(String.valueOf(res.getObject(i))); } sb.append("\n"); } http://git-wip-us.apache.org/repos/asf/tajo/blob/d49a56fe/tajo-core/src/main/java/org/apache/tajo/webapp/QueryExecutorServlet.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/webapp/QueryExecutorServlet.java b/tajo-core/src/main/java/org/apache/tajo/webapp/QueryExecutorServlet.java index 705a29d..a04ff6c 100644 --- a/tajo-core/src/main/java/org/apache/tajo/webapp/QueryExecutorServlet.java +++ b/tajo-core/src/main/java/org/apache/tajo/webapp/QueryExecutorServlet.java @@ -514,7 +514,7 @@ public class QueryExecutorServlet extends HttpServlet { } List<Object> row = new ArrayList<Object>(); for(int i = 0; i < numOfColumns; i++) { - row.add(res.getObject(i + 1).toString()); + row.add(String.valueOf(res.getObject(i + 1))); } queryResult.add(row); rowCount++;
