Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 0c5962f1b -> 393cf9bfe


ARTEMIS-1334 Scheduled component shouldn't be synchronized

(cherry picked from commit 8bc15b1199e9aa82c1cb92586deaba46174473ad)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/393cf9bf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/393cf9bf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/393cf9bf

Branch: refs/heads/1.x
Commit: 393cf9bfefc0bde17aad74db27743e99c50a47b7
Parents: 0c5962f
Author: Clebert Suconic <clebertsuco...@apache.org>
Authored: Tue Aug 8 16:00:01 2017 -0400
Committer: Clebert Suconic <clebertsuco...@apache.org>
Committed: Thu Aug 10 14:12:13 2017 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/server/ActiveMQScheduledComponent.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/393cf9bf/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
----------------------------------------------------------------------
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
index 7aeec1e..e6c015e 100644
--- 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
@@ -41,7 +41,7 @@ public abstract class ActiveMQScheduledComponent implements 
ActiveMQComponent, R
    private long millisecondsPeriod;
    private TimeUnit timeUnit;
    private final Executor executor;
-   private ScheduledFuture future;
+   private volatile ScheduledFuture future;
    private final boolean onDemand;
 
    long lastTime = 0;
@@ -144,7 +144,7 @@ public abstract class ActiveMQScheduledComponent implements 
ActiveMQComponent, R
    }
 
    @Override
-   public synchronized void stop() {
+   public void stop() {
       if (future != null) {
          future.cancel(false);
          future = null;

Reply via email to