This is an automated email from the ASF dual-hosted git repository. tmaret pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 307883048dad3b6ba798917e622271b8b31e19f4 Author: tmaret <[email protected]> AuthorDate: Tue Apr 7 22:57:00 2020 +0200 SLING-9340 - Don't interrupt the queue processor thread --- .../journal/impl/subscriber/DistributionSubscriber.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java index 93f528b..3e601ac 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java @@ -166,8 +166,6 @@ public class DistributionSubscriber implements DistributionAgent { private volatile boolean running = true; - private volatile Thread queueProcessor; - @Activate public void activate(SubscriberConfiguration config, BundleContext context, Map<String, Object> properties) { String subSlingId = requireNonNull(slingSettings.getSlingId()); @@ -203,7 +201,7 @@ public class DistributionSubscriber implements DistributionAgent { commandPoller = new CommandPoller(messagingProvider, topics, subSlingId, subAgentName, editable); - queueProcessor = startBackgroundThread(this::processQueue, + startBackgroundThread(this::processQueue, format("Queue Processor for Subscriber agent %s", subAgentName)); int announceDelay = PropertiesUtil.toInteger(properties.get("announceDelay"), 10000); @@ -249,10 +247,6 @@ public class DistributionSubscriber implements DistributionAgent { IOUtils.closeQuietly(subscriberIdle, announcer, bookKeeper, packagePoller, commandPoller); running = false; - Thread interrupter = this.queueProcessor; - if (interrupter != null) { - interrupter.interrupt(); - } String msg = String.format( "Stopped Subscriber agent %s, subscribed to Publisher agent names %s with package builder %s", subAgentName, queueNames, pkgType);
