Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf0a4b9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf0a4b9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf0a4b9c Branch: refs/heads/trunk Commit: bf0a4b9cd6324e9c5adfe8cdd72ecb1c3a70568a Parents: 478d54d b337c69 Author: Alex Petrov <[email protected]> Authored: Fri Jul 21 11:35:37 2017 +0200 Committer: Alex Petrov <[email protected]> Committed: Fri Jul 21 11:35:37 2017 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf0a4b9c/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java index 66835ef,c9e69f5..d6c28d4 --- a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java +++ b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java @@@ -57,10 -54,9 +57,10 @@@ final class HintsDispatchExecuto { this.hintsDirectory = hintsDirectory; this.isPaused = isPaused; + this.isAlive = isAlive; scheduledDispatches = new ConcurrentHashMap<>(); - executor = new JMXEnabledThreadPoolExecutor(maxThreads, maxThreads,1, TimeUnit.MINUTES, + executor = new JMXEnabledThreadPoolExecutor(maxThreads, 1, TimeUnit.MINUTES, new LinkedBlockingQueue<>(), new NamedThreadFactory("HintsDispatcher", Thread.MIN_PRIORITY), "internal"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
