activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1518123 - /activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
Date Wed, 28 Aug 2013 09:31:40 GMT
Author: gtully
Date: Wed Aug 28 09:31:40 2013
New Revision: 1518123

URL: http://svn.apache.org/r1518123
Log:
https://issues.apache.org/jira/browse/AMQ-3024 - guard against null from stomp tests, npe
regression

Modified:
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java

Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java?rev=1518123&r1=1518122&r2=1518123&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
(original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
Wed Aug 28 09:31:40 2013
@@ -289,7 +289,7 @@ public class SchedulerBroker extends Bro
 
     protected synchronized JobScheduler getInternalScheduler() throws Exception {
         if (this.started.get()) {
-            if (this.scheduler == null) {
+            if (this.scheduler == null && store != null) {
                 this.scheduler = store.getJobScheduler("JMS");
                 this.scheduler.addListener(this);
                 this.scheduler.startDispatching();



Mime
View raw message