PHOENIX-2153 Fix a couple of Null pointer dereferences(Alicia Ying Shu)

Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e4d569cd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e4d569cd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e4d569cd

Branch: refs/heads/calcite
Commit: e4d569cd8bda5e7c828d3bae9b12165b0272b67a
Parents: fa58fc5
Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org>
Authored: Mon Feb 8 16:06:41 2016 +0530
Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org>
Committed: Mon Feb 8 16:06:41 2016 +0530

----------------------------------------------------------------------
 .../main/java/org/apache/phoenix/expression/InListExpression.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e4d569cd/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java
index b6d5a24..a4a9353 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/InListExpression.java
@@ -87,7 +87,7 @@ public class InListExpression extends BaseSingleExpression {
             }
         }
         if (coercedKeyExpressions.size() == 1) {
-            throw sqlE;
+            throw sqlE != null ? sqlE : new SQLException("Only one element in 
IN list");
         }
         if (coercedKeyExpressions.size() == 2 && addedNull) {
             return LiteralExpression.newConstant(null, PBoolean.INSTANCE, 
Determinism.ALWAYS);

Reply via email to