From 6c2dbc4708c2db6ecc3ac4a094d70fe3fc83915c Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 22 Mar 2021 18:30:02 +0100
Subject: [PATCH] GH-2118 Wrap publishing ApplicationEvent in try/catch

. . . to ensure that any exceptions resulting from custom implementation of ApplicationLstener does not harm the application
There will now be a WARN message and the stacj trace under DEBUG, but the application will continue to function.

Resolves #2118
---
 .../binder/AbstractMessageChannelBinder.java  | 10 +++++++-
 .../ImplicitFunctionBindingTests.java         | 23 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
index 77dfd9d06..a93715271 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
@@ -917,7 +917,15 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 
 	private void doPublishEvent(ApplicationEvent event) {
 		if (this.applicationEventPublisher != null) {
-			this.applicationEventPublisher.publishEvent(event);
+			try {
+				this.applicationEventPublisher.publishEvent(event);
+			}
+			catch (Exception e) {
+				logger.warn("Failed while publishing event " + event + ". "
+						+ "From the framework perspective this is harmless and typically "
+						+ "happens when use implement custom ApplicationListener");
+				logger.debug(e);
+			}
 		}
 	}
 
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
index 8f695cc8a..4a22519a0 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
@@ -44,6 +44,7 @@ import org.springframework.cloud.function.context.config.ContextFunctionCatalogA
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.cloud.stream.binder.Binding;
+import org.springframework.cloud.stream.binder.BindingCreatedEvent;
 import org.springframework.cloud.stream.binder.test.FunctionBindingTestUtils;
 import org.springframework.cloud.stream.binder.test.InputDestination;
 import org.springframework.cloud.stream.binder.test.OutputDestination;
@@ -52,6 +53,7 @@ import org.springframework.cloud.stream.binding.BindingsLifecycleController;
 import org.springframework.cloud.stream.binding.BindingsLifecycleController.State;
 import org.springframework.cloud.stream.messaging.DirectWithAttributesChannel;
 import org.springframework.cloud.stream.messaging.Sink;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.integration.channel.QueueChannel;
@@ -84,10 +86,11 @@ public class ImplicitFunctionBindingTests {
 	}
 
 
+
 	@Test
-	public void testExplicitChannelConfiguration() {
+	public void testFailedApplicationListenerConfiguration() {
 		try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
-				TestChannelBinderConfiguration.getCompleteConfiguration(ExplicitChannelConfiguration.class))
+				TestChannelBinderConfiguration.getCompleteConfiguration(FailedApplicationListenerConfiguration.class))
 						.web(WebApplicationType.NONE)
 						.run("--spring.jmx.enabled=false", "--spring.cloud.function.definition=echo")) {
 
@@ -1510,6 +1513,22 @@ public class ImplicitFunctionBindingTests {
 		}
 	}
 
+	@EnableAutoConfiguration
+	public static class FailedApplicationListenerConfiguration {
+
+		@Bean
+		public Function<String, String> echo() {
+			return x -> x;
+		}
+
+		@Bean
+		public ApplicationListener<BindingCreatedEvent> bindingCreatedEventListener() {
+			return bindingCreatedEvent -> {
+				throw new RuntimeException("Test");
+			};
+		}
+	}
+
 	public static class Person {
 		private String name;
 		private int id;