root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

BeanNameAutoProxyCreator detects alias matches for specified bean names as well (SPR-6774)

This commit is contained in:
Juergen Hoeller 2010-01-31 14:12:48 +00:00
parent 6b2b5c4c23
commit 6070a498fe
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -84,6 +84,15 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
if (isMatch(beanName, mappedName)) { if (isMatch(beanName, mappedName)) {
return PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS; return PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS;
} }
BeanFactory beanFactory = getBeanFactory();
if (beanFactory != null) {
String[] aliases = beanFactory.getAliases(beanName);
for (String alias : aliases) {
if (isMatch(alias, mappedName)) {
return PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS;
}
}
}
} }
} }
return DO_NOT_PROXY; return DO_NOT_PROXY;

4
org.springframework.context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
View File

@ -92,10 +92,12 @@
<property name="name"><value>jdk1</value></property> <property name="name"><value>jdk1</value></property>
</bean> </bean>
<bean id="frozenBean" class="org.springframework.beans.TestBean"> <bean id="frozen" class="org.springframework.beans.TestBean">
<property name="name" value="frozenBean"/> <property name="name" value="frozenBean"/>
</bean> </bean>
<alias name="frozen" alias="frozenBean"/>
<bean id="cglib1" class="org.springframework.beans.TestBean"> <bean id="cglib1" class="org.springframework.beans.TestBean">
<property name="name"><value>cglib1</value></property> <property name="name"><value>cglib1</value></property>
</bean> </bean>