Issue 1450: avoid NullPointerException which occurs during shutdown o… (#1451)

maecval · garyrussell · web-flow · commit 0557be4e0013 · 2022-04-14T11:37:08.000-04:00
* 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 &lt;grussell@vmware.com&gt;

Co-authored-by: Gary Russell &lt;grussell@vmware.com&gt;
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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ protected ApplicationEventPublisher getApplicationEventPublisher() {`
`212`	`212`
`213`	`213`	`@Override`
`214`	`214`	`public void onApplicationEvent(ContextClosedEvent event) {`
`215`		`- if (getApplicationContext().equals(event.getApplicationContext())) {`
	`215`	`+ if (event.getApplicationContext().equals(getApplicationContext())) {`
`216`	`216`	`this.contextStopped = true;`
`217`	`217`	`}`
`218`	`218`	`if (this.publisherConnectionFactory != null) {`