cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [1/3] git commit: fix npe when specifying -Dcassandra.fd_initial_value_ms
Date Tue, 29 Apr 2014 00:00:40 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 9a0f25890 -> 7316bb3a6


fix npe when specifying -Dcassandra.fd_initial_value_ms

patch by dbrosius reviewed by bwilliams for cassandra 6751


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

Branch: refs/heads/cassandra-2.1
Commit: 7f019804ca82c727062c2a787fe534690e9dbf6d
Parents: 63ba588
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Mon Apr 28 19:51:56 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Mon Apr 28 19:51:56 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                            | 1 +
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f019804/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index aad3721..e8d6a8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,7 @@
  * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058)
  * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
  * Always clean up references in SerializingCache (CASSANDRA-6994)
+ * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
 
 
 1.2.16

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f019804/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index 7a35c34..f5c500c 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -43,12 +43,12 @@ import org.apache.cassandra.utils.FBUtilities;
  */
 public class FailureDetector implements IFailureDetector, FailureDetectorMBean
 {
+    private static final Logger logger = LoggerFactory.getLogger(FailureDetector.class);
     public static final String MBEAN_NAME = "org.apache.cassandra.net:type=FailureDetector";
     private static final int SAMPLE_SIZE = 1000;
     protected static final int INITIAL_VALUE = getInitialValue();
 
     public static final IFailureDetector instance = new FailureDetector();
-    private static final Logger logger = LoggerFactory.getLogger(FailureDetector.class);
 
     // this is useless except to provide backwards compatibility in phi_convict_threshold,
     // because everyone seems pretty accustomed to the default of 8, and users who have


Mime
View raw message