You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/12/20 00:44:40 UTC
[3/6] git commit: Don't allow null max_hint_window_in_ms patch by
Nate McCall; reviewed by jbellis for CASSANDRA-6419
Don't allow null max_hint_window_in_ms
patch by Nate McCall; reviewed by jbellis for CASSANDRA-6419
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4895c55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4895c55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4895c55
Branch: refs/heads/trunk
Commit: a4895c551fb31bea90111a960f2c51634950536c
Parents: 38642c5
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 19 17:41:17 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 19 17:41:17 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4895c55/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3488cde..6f6c131 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@
* Don't send confusing info with timeouts (CASSANDRA-6491)
* Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
* Don't drop local mutations without a trace (CASSANDRA-6510)
+ * Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
+
1.2.13
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4895c55/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7843fc1..0db2f85 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -256,6 +256,11 @@ public class DatabaseDescriptor
}
paritionerName = partitioner.getClass().getCanonicalName();
+ if (conf.max_hint_window_in_ms == null)
+ {
+ throw new ConfigurationException("max_hint_window_in_ms cannot be set to null");
+ }
+
/* phi convict threshold for FailureDetector */
if (conf.phi_convict_threshold < 5 || conf.phi_convict_threshold > 16)
{