AbstractApplicationContext.getApplicationListeners() exposes all statically registered listeners

jhoeller · jhoeller · commit d61a7ed1f0e0 · 2018-10-10T00:14:48.000+02:00
Issue: SPR-17324 (cherry picked from commit c8c0737)
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -500,9 +500,7 @@ public void addApplicationListener(ApplicationListener<?> listener) {
 		if (this.applicationEventMulticaster != null) {
 			this.applicationEventMulticaster.addApplicationListener(listener);
 		}
-		else {
-			this.applicationListeners.add(listener);
-		}
+		this.applicationListeners.add(listener);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -500,9 +500,7 @@ public void addApplicationListener(ApplicationListener<?> listener) {`
`500`	`500`	`if (this.applicationEventMulticaster != null) {`
`501`	`501`	`this.applicationEventMulticaster.addApplicationListener(listener);`
`502`	`502`	`}`
`503`		`- else {`
`504`		`- this.applicationListeners.add(listener);`
`505`		`- }`
	`503`	`+ this.applicationListeners.add(listener);`
`506`	`504`	`}`
`507`	`505`
`508`	`506`	`/**`