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

DATACMNS-239 - Fixed event handling in AbstractResourcePopulatorFactoryBean.

Browse Source 
Switched from implementing ApplicationEventPublisherAware to ApplicationContextAware to get a reference to an ApplicationContext to fix comparison of the event source.
This commit is contained in:
Oliver Gierke
2012-10-09 10:59:08 +02:00
parent 861cf40419
commit 75026cdb1d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-data-commons-core/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java
View File

@@ -17,8 +17,8 @@ package org.springframework.data.repository.init;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.io.Resource;
@@ -33,11 +33,11 @@ import org.springframework.util.Assert;
*/
public abstract class AbstractRepositoryPopulatorFactoryBean extends
AbstractFactoryBean<ResourceReaderRepositoryPopulator> implements ApplicationListener<ContextRefreshedEvent>,
ApplicationEventPublisherAware {
ApplicationContextAware {
private Resource[] resources;
private RepositoryPopulator populator;
private ApplicationEventPublisher publisher;
private ApplicationContext context;
/**
* Configures the {@link Resource}s to be used to load objects from and initialize the repositories eventually.
@@ -51,10 +51,10 @@ public abstract class AbstractRepositoryPopulatorFactoryBean extends
/*
* (non-Javadoc)
* @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
public void setApplicationEventPublisher(ApplicationEventPublisher publisher) {
this.publisher = publisher;
public void setApplicationContext(ApplicationContext applicationContext) {
this.context = applicationContext;
}
/*
@@ -75,7 +75,7 @@ public abstract class AbstractRepositoryPopulatorFactoryBean extends
ResourceReaderRepositoryPopulator initializer = new ResourceReaderRepositoryPopulator(getResourceReader());
initializer.setResources(resources);
initializer.setApplicationEventPublisher(publisher);
initializer.setApplicationEventPublisher(context);
this.populator = initializer;
@@ -88,7 +88,7 @@ public abstract class AbstractRepositoryPopulatorFactoryBean extends
*/
public void onApplicationEvent(ContextRefreshedEvent event) {
if (event.getApplicationContext().equals(getBeanFactory())) {
if (event.getApplicationContext().equals(context)) {
Repositories repositories = new Repositories(event.getApplicationContext());
populator.populate(repositories);
}