You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/09/06 16:57:20 UTC
git commit: fix potential NPE with both equal and unequal restriction
Updated Branches:
refs/heads/cassandra-1.1 acaa52465 -> 8e03f7bdf
fix potential NPE with both equal and unequal restriction
patch by slebresne; reviewed by jbellis for CASSANDRA-4532
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e03f7bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e03f7bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e03f7bd
Branch: refs/heads/cassandra-1.1
Commit: 8e03f7bdf26558dc397628c885c5b6ab0cfde3e0
Parents: acaa524
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 6 16:56:29 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 6 16:56:29 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../cassandra/cql3/statements/SelectStatement.java | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e03f7bd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b33b2c3..6e72892 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+1.1.6
+ * (cql3) fix potential NPE with both equal and unequal restriction (CASSANDRA-4532)
+
1.1.5
* add SecondaryIndex.reload API (CASSANDRA-4581)
* use millis + atomicint for commitlog segment creation instead of
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e03f7bd/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 0c34eb0..dd00c5c 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1274,6 +1274,9 @@ public class SelectStatement implements CQLStatement
break;
}
+ if (bounds == null)
+ throw new InvalidRequestException(String.format("%s cannot be restricted by both an equal and an inequal relation", name));
+
if (bounds[b.idx] != null)
throw new InvalidRequestException(String.format("Invalid restrictions found on %s", name));
bounds[b.idx] = t;