Polishing

Author: jhoeller

spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java

@@ -136,7 +136,7 @@ protected Collection<ApplicationListener> getApplicationListeners() {
 	protected Collection<ApplicationListener> getApplicationListeners(ApplicationEvent event) {
 		Class<? extends ApplicationEvent> eventType = event.getClass();
 		Object source = event.getSource();
-		Class sourceType = (source == null ? null : source.getClass());
+		Class<?> sourceType = (source != null ? source.getClass() : null);
 		ListenerCacheKey cacheKey = new ListenerCacheKey(eventType, sourceType);
 		ListenerRetriever retriever = this.retrieverCache.get(cacheKey);
 		if (retriever != null) {
@@ -199,11 +199,11 @@ protected boolean supportsEvent(
 	 */
 	private static class ListenerCacheKey {
 
-		private final Class eventType;
+		private final Class<?> eventType;
 
-		private final Class sourceType;
+		private final Class<?> sourceType;
 
-		public ListenerCacheKey(Class eventType, Class sourceType) {
+		public ListenerCacheKey(Class<?> eventType, Class<?> sourceType) {
 			this.eventType = eventType;
 			this.sourceType = sourceType;
 		}
@@ -214,14 +214,13 @@ public boolean equals(Object other) {
 				return true;
 			}
 			ListenerCacheKey otherKey = (ListenerCacheKey) other;
-			return ObjectUtils.nullSafeEquals(this.eventType, otherKey.eventType)
-					&& ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType);
+			return ObjectUtils.nullSafeEquals(this.eventType, otherKey.eventType) &&
+					ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType);
 		}
 
 		@Override
 		public int hashCode() {
-			return ObjectUtils.nullSafeHashCode(this.eventType) * 29
-					+ ObjectUtils.nullSafeHashCode(this.sourceType);
+			return ObjectUtils.nullSafeHashCode(this.eventType) * 29 + ObjectUtils.nullSafeHashCode(this.sourceType);
 		}
 	}
 

spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java

@@ -37,6 +37,7 @@
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ApplicationEventMulticaster;
 import org.springframework.core.OrderComparator;
 import org.springframework.core.Ordered;
 import org.springframework.core.PriorityOrdered;
@@ -369,8 +370,9 @@ else if (flag == null) {
 		@Override
 		public void postProcessBeforeDestruction(Object bean, String beanName) {
 			if (bean instanceof ApplicationListener) {
-				this.applicationContext.getApplicationEventMulticaster().removeApplicationListener((ApplicationListener) bean);
-				this.applicationContext.getApplicationEventMulticaster().removeApplicationListenerBean(beanName);
+				ApplicationEventMulticaster multicaster = this.applicationContext.getApplicationEventMulticaster();
+				multicaster.removeApplicationListener((ApplicationListener) bean);
+				multicaster.removeApplicationListenerBean(beanName);
 			}
 		}
 	}