cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Avoid NPE
Date Fri, 19 Jul 2013 16:05:30 GMT
Updated Branches:
  refs/heads/trunk 5a18e3706 -> ed645f32a


Avoid NPE


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

Branch: refs/heads/trunk
Commit: ed645f32aaa0247f010840170594f5b214c6c185
Parents: 5a18e37
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jul 19 18:05:22 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jul 19 18:05:22 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed645f32/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 63655a8..2987154 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -523,7 +523,7 @@ public abstract class ModificationStatement implements CQLStatement
         {
             super(name);
             this.attrs = attrs;
-            this.conditions = conditions;
+            this.conditions = conditions == null ? Collections.<Pair<ColumnIdentifier,
Operation.RawUpdate>>emptyList() : conditions;
             this.ifNotExists = ifNotExists;
         }
 


Mime
View raw message