Cancel subscription for MPS.subscribeToPublisher

spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.integration.endpoint;
 
 import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscription;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.SmartInitializingSingleton;
@@ -66,6 +67,8 @@ public abstract class MessageProducerSupport extends AbstractEndpoint implements
 
 	private boolean shouldTrack = false;
 
+	private volatile Subscription subscription;
+
 	protected MessageProducerSupport() {
 		this.setPhase(Integer.MAX_VALUE / 2);
 	}
@@ -196,6 +199,11 @@ protected void doStart() {
 	 */
 	@Override
 	protected void doStop() {
+		Subscription subscriptionToCancel = this.subscription;
+		if (subscriptionToCancel != null) {
+			this.subscription = null;
+			subscriptionToCancel.cancel();
+		}
 	}
 
 	protected void sendMessage(Message<?> messageArg) {
@@ -222,7 +230,7 @@ protected void subscribeToPublisher(Publisher<? extends Message<?>> publisher) {
 						.map(this::trackMessageIfAny)
 						.doOnComplete(this::stop)
 						.doOnCancel(this::stop)
-						.takeWhile((message) -> isActive());
+						.doOnSubscribe((subscription) -> this.subscription = subscription);
 
 		if (channelForSubscription instanceof ReactiveStreamsSubscribableChannel) {
 			((ReactiveStreamsSubscribableChannel) channelForSubscription).subscribeTo(messageFlux);

spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageProducerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,19 @@
 
 package org.springframework.integration.endpoint;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.channel.FluxMessageChannel;
+import org.springframework.integration.channel.NullChannel;
 import org.springframework.integration.config.EnableIntegration;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.GenericMessage;
@@ -49,12 +54,36 @@ public class ReactiveMessageProducerTests {
 	public MessageProducerSupport producer;
 
 	@Test
-	public void test() {
+	public void testEmptyPublisherUnsubscription() throws InterruptedException {
+		CountDownLatch cancelLatch = new CountDownLatch(1);
+		MessageProducerSupport producer =
+				new MessageProducerSupport() {
+
+					@Override
+					protected void doStart() {
+						super.doStart();
+						subscribeToPublisher(
+								Flux.just("test1")
+										.delayElements(Duration.ofSeconds(10))
+										.map(GenericMessage::new)
+										.doOnCancel(cancelLatch::countDown));
+					}
+
+				};
+		producer.setOutputChannel(new NullChannel());
+		producer.start();
+		producer.stop();
+
+		assertThat(cancelLatch.await(10, TimeUnit.SECONDS)).isTrue();
+	}
+
+	@Test
+	public void testReactiveMessageProducerFromContext() {
 		StepVerifier stepVerifier =
 				StepVerifier.create(
-						Flux.from(this.fluxMessageChannel)
-								.map(Message::getPayload)
-								.cast(String.class))
+								Flux.from(this.fluxMessageChannel)
+										.map(Message::getPayload)
+										.cast(String.class))
 						.expectNext("test1", "test2")
 						.thenCancel()
 						.verifyLater();

spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -292,6 +292,7 @@ private Mono<Message<?>> convertMessage(Mono<ZMsg> msgMono) {
 
 	@Override
 	protected void doStop() {
+		super.doStop();
 		this.socketMono.doOnNext(ZMQ.Socket::close).subscribe();
 	}