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

INT-1905 Set Handler Component Name, Even If Proxied

Browse Source
This commit is contained in:
Gary Russell
2011-05-17 18:21:16 -04:00
parent feed13da97
commit b0972a57dd
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.integration.config;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -107,8 +109,17 @@ public class ConsumerEndpointFactoryBean
}
public void afterPropertiesSet() throws Exception {
if (!this.beanName.startsWith("org.springframework") && this.handler instanceof IntegrationObjectSupport) {
((IntegrationObjectSupport) this.handler).setComponentName(this.beanName);
if (!this.beanName.startsWith("org.springframework")) {
MessageHandler targetHandler = this.handler;
if (AopUtils.isAopProxy(targetHandler)) {
Object target = ((Advised) targetHandler).getTargetSource().getTarget();
if (target instanceof MessageHandler) {
targetHandler = (MessageHandler) target;
}
}
if (targetHandler instanceof IntegrationObjectSupport) {
((IntegrationObjectSupport) targetHandler).setComponentName(this.beanName);
}
}
this.initializeEndpoint();
}