You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2015/09/22 05:02:54 UTC
tajo git commit: TAJO-1873: Fix NPE in QueryExecutorServlet.
Repository: tajo
Updated Branches:
refs/heads/master 08def97c4 -> eef7878bd
TAJO-1873: Fix NPE in QueryExecutorServlet.
Closes #774
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/eef7878b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/eef7878b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/eef7878b
Branch: refs/heads/master
Commit: eef7878bd3d82dc0468e3e977e43a46d3903781a
Parents: 08def97
Author: Jinho Kim <jh...@apache.org>
Authored: Tue Sep 22 12:02:17 2015 +0900
Committer: Jinho Kim <jh...@apache.org>
Committed: Tue Sep 22 12:02:17 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/eef7878b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a7eed33..992eb27 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/eef7878b/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/eef7878b/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++;