[Springframework-cvs] spring/src/org/springframework/aop/framework/autoproxy AbstractAutoProxyCreator.java, 1.55, 1.56

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/aop/framework/autoproxy
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4296/src/org/springframework/aop/framework/autoproxy

Modified Files:
	AbstractAutoProxyCreator.java 
Log Message:
AbstractAutoProxyCreator (as used by "aop:config") correctly ignores null bean instances

Index: AbstractAutoProxyCreator.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** AbstractAutoProxyCreator.java	9 May 2008 09:58:45 -0000	1.55
--- AbstractAutoProxyCreator.java	13 Aug 2008 12:07:22 -0000	1.56
***************
*** 320,326 ****
  	 */
  	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
! 		Object cacheKey = getCacheKey(bean.getClass(), beanName);
! 		if (!this.earlyProxyReferences.contains(cacheKey)) {
! 			return wrapIfNecessary(bean, beanName, cacheKey);
  		}
  		return bean;
--- 320,328 ----
  	 */
  	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
! 		if (bean != null) {
! 			Object cacheKey = getCacheKey(bean.getClass(), beanName);
! 			if (!this.earlyProxyReferences.contains(cacheKey)) {
! 				return wrapIfNecessary(bean, beanName, cacheKey);
! 			}
  		}
  		return bean;