Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing (backported from several master changes)

Browse Source
This commit is contained in:
Juergen Hoeller
2013-10-30 22:06:51 +01:00
parent d4f4225e53
commit 1ac8e48ebf
6 changed files with 121 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application
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) {
@@ -193,11 +193,11 @@ public abstract class AbstractApplicationEventMulticaster implements Application
*/
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;
}
@@ -208,14 +208,13 @@ public abstract class AbstractApplicationEventMulticaster implements Application
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);
}
}