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

Multicaster support for events with null source

Browse Source 
Update `AbstractApplicationEventMulticaster` to support `EventObjects`
with a null source (which can happen if they have been serialized).

Issue: SPR-10945
This commit is contained in:
Phillip Webb
2013-10-21 11:55:16 -07:00
parent 6d882b149d
commit b0ff834ee3
5 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.core.OrderComparator;
import org.springframework.util.ObjectUtils;
/**
* Abstract implementation of the {@link ApplicationEventMulticaster} interface,
@@ -134,7 +135,8 @@ public abstract class AbstractApplicationEventMulticaster implements Application
*/
protected Collection<ApplicationListener> getApplicationListeners(ApplicationEvent event) {
Class<? extends ApplicationEvent> eventType = event.getClass();
Class sourceType = event.getSource().getClass();
Object source = event.getSource();
Class sourceType = (source == null ? null : source.getClass());
ListenerCacheKey cacheKey = new ListenerCacheKey(eventType, sourceType);
ListenerRetriever retriever = this.retrieverCache.get(cacheKey);
if (retriever != null) {
@@ -212,12 +214,14 @@ public abstract class AbstractApplicationEventMulticaster implements Application
return true;
}
ListenerCacheKey otherKey = (ListenerCacheKey) other;
return (this.eventType.equals(otherKey.eventType) && this.sourceType.equals(otherKey.sourceType));
return ObjectUtils.nullSafeEquals(this.eventType, otherKey.eventType)
&& ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType);
}
@Override
public int hashCode() {
return this.eventType.hashCode() * 29 + this.sourceType.hashCode();
return ObjectUtils.nullSafeHashCode(this.eventType) * 29
+ ObjectUtils.nullSafeHashCode(this.sourceType);
}
}

4
spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ public class SourceFilteringListener implements SmartApplicationListener {
@Override
public boolean supportsSourceType(Class<?> sourceType) {
return sourceType.isInstance(this.source);
return (sourceType != null && sourceType.isInstance(this.source));
}
@Override