cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix NPE when using static columns and IN
Date Fri, 28 Feb 2014 20:57:07 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 89da2c970 -> fd609339e


Fix NPE when using static columns and IN

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6769


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

Branch: refs/heads/cassandra-2.0
Commit: fd609339eebd13e2adc37969c8e0b439775a17af
Parents: 89da2c9
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Feb 28 21:56:08 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Feb 28 21:56:08 2014 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd609339/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 9fbed03..5a9d3d9 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -508,7 +508,7 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
                     slices = new ColumnSlice[l.size()+1];
                     slices[0] = staticSlice;
                     for (int i = 0; i < l.size(); i++)
-                        slices[i] = l.get(i);
+                        slices[i+1] = l.get(i);
                 }
             }
             return sliceFilter(slices, limit, toGroup);


Mime
View raw message