cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: simplify
Date Sun, 23 Mar 2014 05:03:43 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 053c17d88 -> 6f24097f6


simplify


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

Branch: refs/heads/trunk
Commit: 6f24097f66b1575045e5f222cd5de6bc70c505e6
Parents: 053c17d
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Sun Mar 23 01:03:16 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Sun Mar 23 01:03:16 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f24097f/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
index 9451ce9..835e0e9 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
@@ -66,7 +66,7 @@ public class CQL3CasConditions implements CASConditions
     {
         RowCondition previous = conditions.put(prefix, new ExistCondition(prefix, now));
         // this should be prevented by the parser, but it doesn't hurt to check
-        if (previous != null && previous instanceof NotExistCondition)
+        if (previous instanceof NotExistCondition)
             throw new InvalidRequestException("Cannot mix IF EXISTS and IF NOT EXISTS conditions
for the same row");
     }
 


Mime
View raw message