cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject git commit: Fix CFMetaData.equals()
Date Fri, 07 Feb 2014 22:05:55 GMT
Updated Branches:
  refs/heads/trunk 01cf29c3e -> 0ced33c6e


Fix CFMetaData.equals()


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

Branch: refs/heads/trunk
Commit: 0ced33c6ee2469c68862a90cae7be477274f3be0
Parents: 01cf29c
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Feb 8 01:05:47 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Feb 8 01:05:47 2014 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/CFMetaData.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ced33c6/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index f600b83..9579f99 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -926,8 +926,8 @@ public final class CFMetaData
         if (indexInterval != rhs.indexInterval) return false;
         if (!Objects.equal(speculativeRetry, rhs.speculativeRetry)) return false;
         if (populateIoCacheOnFlush != rhs.populateIoCacheOnFlush) return false;
-        if (Objects.equal(droppedColumns, rhs.droppedColumns)) return false;
-        if (Objects.equal(triggers, rhs.triggers)) return false;
+        if (!Objects.equal(droppedColumns, rhs.droppedColumns)) return false;
+        if (!Objects.equal(triggers, rhs.triggers)) return false;
         if (!Objects.equal(rowsPerPartitionToCache, rhs.rowsPerPartitionToCache)) return
false;
         return true;
     }


Mime
View raw message