Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 11d4e73e2 -> fccded58a refs/heads/cassandra-2.2 849a43869 -> 280da1843 refs/heads/cassandra-3.0 eda763b47 -> 14918b76f refs/heads/cassandra-3.7 baaf74616 -> 13ee50a51 refs/heads/trunk d473a2811 -> adea6678f
CASSANDRA-11644 - commit to 2.1/2.2/3.0 branches Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fccded58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fccded58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fccded58 Branch: refs/heads/cassandra-2.1 Commit: fccded58a6f2ea03dd501c3889e0aa14b6571e16 Parents: 11d4e73 Author: jasonstack <[email protected]> Authored: Tue Apr 26 00:07:29 2016 +0800 Committer: Josh McKenzie <[email protected]> Committed: Fri May 13 12:36:54 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/GCInspector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fccded58/src/java/org/apache/cassandra/service/GCInspector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/GCInspector.java b/src/java/org/apache/cassandra/service/GCInspector.java index cf17a34..2d3d4f3 100644 --- a/src/java/org/apache/cassandra/service/GCInspector.java +++ b/src/java/org/apache/cassandra/service/GCInspector.java @@ -48,7 +48,7 @@ public class GCInspector implements NotificationListener, GCInspectorMXBean private static final Logger logger = LoggerFactory.getLogger(GCInspector.class); final static long MIN_LOG_DURATION = 200; final static long GC_WARN_THRESHOLD_IN_MS = DatabaseDescriptor.getGCWarnThreshold(); - final static long STAT_THRESHOLD = Math.min(GC_WARN_THRESHOLD_IN_MS != 0 ? GC_WARN_THRESHOLD_IN_MS : MIN_LOG_DURATION, MIN_LOG_DURATION); + final static long STAT_THRESHOLD = GC_WARN_THRESHOLD_IN_MS != 0 ? GC_WARN_THRESHOLD_IN_MS : MIN_LOG_DURATION; static final class State {
