Updated Branches:
  refs/heads/cassandra-1.2 8d319b06a -> e655d62a4
  refs/heads/cassandra-2.0 2ab13706b -> 96c0256d3
  refs/heads/trunk b685e1118 -> 832c4e98b


Remove new asserts in CMFD
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6208


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

Branch: refs/heads/cassandra-1.2
Commit: e655d62a476f1507ab77c6ba8de2d15e3851f5e0
Parents: 8d319b0
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Wed Oct 16 13:44:34 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Wed Oct 16 13:44:34 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e655d62a/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 fcbd012..85c3dcb 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -309,10 +309,6 @@ public final class CFMetaData
 
     CFMetaData(String keyspace, String name, ColumnFamilyType type, 
AbstractType<?> comp, AbstractType<?> subcc, UUID id)
     {
-        assert keyspace != null;
-        assert name != null;
-        assert type != null;
-        assert id != null;
         // (subcc may be null for non-supercolumns)
         // (comp may also be null for custom indexes, which is kind of broken 
if you ask me)
 

Reply via email to