PHOENIX-1376 java.lang.NullPointerException occurs in JDBC driver
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/72144f17 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/72144f17 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/72144f17 Branch: refs/heads/3.0 Commit: 72144f17884518b1152b83d294b77f10c2a743a5 Parents: 2681601 Author: James Taylor <jtay...@salesforce.com> Authored: Mon Oct 27 13:40:47 2014 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Mon Oct 27 13:45:38 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java | 5 ----- .../main/java/org/apache/phoenix/schema/tuple/ResultTuple.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/72144f17/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java index e662a3f..8a6cf64 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java @@ -1232,9 +1232,4 @@ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.pho public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { return (T) getObject(columnLabel); // Just ignore type since we only support built-in types } - - @Override - public String toString(){ - return "ResultSet:\n"+ "\tclosed: "+this.isClosed+"\n\tcurrent row: "+currentRow; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/72144f17/phoenix-core/src/main/java/org/apache/phoenix/schema/tuple/ResultTuple.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/tuple/ResultTuple.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/tuple/ResultTuple.java index 02aebf7..f0dbd9e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/tuple/ResultTuple.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/tuple/ResultTuple.java @@ -62,7 +62,7 @@ public class ResultTuple extends BaseTuple { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("keyvalues="); - if(this.result.isEmpty()) { + if(this.result == null || this.result.isEmpty()) { sb.append("NONE"); return sb.toString(); }
