From 0557be4e00130e7e8edc3a3910d0ff5b33d4804c Mon Sep 17 00:00:00 2001 From: maecval Date: Thu, 14 Apr 2022 17:37:08 +0200 Subject: [PATCH] =?UTF-8?q?Issue=201450:=20avoid=20NullPointerException=20?= =?UTF-8?q?which=20occurs=20during=20shutdown=20o=E2=80=A6=20(#1451)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Issue 1450: avoid NullPointerException which occurs during shutdown of the SpringBoot app * Update spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java Co-authored-by: Gary Russell Co-authored-by: Gary Russell --- .../amqp/rabbit/connection/AbstractConnectionFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java index db56a8d7bb..cc0d1c67be 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java @@ -212,7 +212,7 @@ protected ApplicationEventPublisher getApplicationEventPublisher() { @Override public void onApplicationEvent(ContextClosedEvent event) { - if (getApplicationContext().equals(event.getApplicationContext())) { + if (event.getApplicationContext().equals(getApplicationContext())) { this.contextStopped = true; } if (this.publisherConnectionFactory != null) {