svn commit: r999574 - /cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java

[jbellis]

Author: jbellis
Date: Tue Sep 21 19:46:45 2010
New Revision: 999574

URL: http://svn.apache.org/viewvc?rev=999574&view=rev
Log:
use default compaction threshold values if it is left unspecified in the thrift 
CfDef.  patch by jbellis; reviewed by Stu Hood for CASSANDRA-1468

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=999574&r1=999573&r2=999574&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java 
Tue Sep 21 19:46:45 2010
@@ -936,8 +936,8 @@ public class CassandraServer implements 
                               cf_def.read_repair_chance,
                               cf_def.isSetGc_grace_seconds() ? 
cf_def.gc_grace_seconds : CFMetaData.DEFAULT_GC_GRACE_SECONDS,
                               
DatabaseDescriptor.getComparator(cf_def.default_validation_class),
-                              cf_def.min_compaction_threshold,
-                              cf_def.max_compaction_threshold,
+                              cf_def.isSetMin_compaction_threshold() ? 
cf_def.min_compaction_threshold : CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD,
+                              cf_def.isSetMax_compaction_threshold() ? 
cf_def.max_compaction_threshold : CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD,
                               
ColumnDefinition.fromColumnDef(cf_def.column_metadata));
     }