From 92b3ae2cd067fc32b73ec0fc4b1436754532d2c4 Mon Sep 17 00:00:00 2001 From: Gary Tully Date: Fri, 8 Oct 2010 15:22:57 +0000 Subject: [PATCH] disable schedualler by default: resolve: https://issues.apache.org/activemq/browse/AMQ-2967, https://issues.apache.org/activemq/browse/AMQ-2959 git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1005858 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/activemq/broker/BrokerService.java | 2 +- .../org/apache/activemq/broker/scheduler/JmsSchedulerTest.java | 1 + .../activemq/broker/scheduler/JobSchedulerManagementTest.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java index 97c1f2f6e4..e3c1952da8 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -192,7 +192,7 @@ public class BrokerService implements Service { private SslContext sslContext; private boolean forceStart = false; private IOExceptionHandler ioExceptionHandler; - private boolean schedulerSupport = true; + private boolean schedulerSupport = false; private File schedulerDirectoryFile; private Scheduler scheduler; private ThreadPoolExecutor executor; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java index 62a9ad36c1..7535cfdad3 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java @@ -235,6 +235,7 @@ public class JmsSchedulerTest extends EmbeddedBrokerTestSupport { answer.setDeleteAllMessagesOnStartup(true); answer.setDataDirectory("target"); answer.setSchedulerDirectoryFile(schedulerDirectory); + answer.setSchedulerSupport(true); answer.setUseJmx(false); answer.addConnector(bindAddress); return answer; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java index 3acd570338..d1b69764dc 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java @@ -415,6 +415,7 @@ public class JobSchedulerManagementTest extends EmbeddedBrokerTestSupport { answer.setDeleteAllMessagesOnStartup(true); answer.setDataDirectory("target"); answer.setSchedulerDirectoryFile(schedulerDirectory); + answer.setSchedulerSupport(true); answer.setUseJmx(false); answer.addConnector(bindAddress); return answer;