Updated Branches: refs/heads/cassandra-1.2 edda8f057 -> cc8d16023
fix String.format format specifier char for float value (d->f) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc8d1602 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc8d1602 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc8d1602 Branch: refs/heads/cassandra-1.2 Commit: cc8d1602329c1ea1e63d57d58a1aca890f15454b Parents: edda8f0 Author: Dave Brosius <[email protected]> Authored: Thu Jan 24 18:45:52 2013 -0500 Committer: Dave Brosius <[email protected]> Committed: Thu Jan 24 18:45:52 2013 -0500 ---------------------------------------------------------------------- .../db/compaction/AbstractCompactionStrategy.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8d1602/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index 066f2f3..356289c 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -29,8 +29,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.SSTableReader; -import com.google.common.collect.Sets; - /** * Pluggable compaction strategy determines how SSTables get merged. * @@ -214,7 +212,7 @@ public abstract class AbstractCompactionStrategy float thresholdValue = Float.parseFloat(threshold); if (thresholdValue < 0) { - throw new ConfigurationException(String.format("%s must be greater than 0, but was %d", TOMBSTONE_THRESHOLD_OPTION, thresholdValue)); + throw new ConfigurationException(String.format("%s must be greater than 0, but was %f", TOMBSTONE_THRESHOLD_OPTION, thresholdValue)); } } catch (NumberFormatException e)
