[Springframework-cvs] spring/src/org/springframework/beans/factory/support DisposableBeanAdapter.java, 1.5, 1.6 AbstractAutowireCapableBeanFactory.java, 1.141, 1.142 SimpleInstantiationStrategy.java, 1.13, 1.14

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

Update of /cvsroot/springframework/spring/src/org/springframework/beans/factory/support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16676/src/org/springframework/beans/factory/support

Modified Files:
	DisposableBeanAdapter.java 
	AbstractAutowireCapableBeanFactory.java 
	SimpleInstantiationStrategy.java 
Log Message:
consistent use of "ReflectionUtils.makeAccessible"

Index: AbstractAutowireCapableBeanFactory.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** AbstractAutowireCapableBeanFactory.java	19 May 2007 22:27:46 -0000	1.141
--- AbstractAutowireCapableBeanFactory.java	21 May 2007 09:57:26 -0000	1.142
***************
*** 1233,1240 ****
  			}
  		}
! 		if (!Modifier.isPublic(initMethod.getModifiers()) ||
! 				!Modifier.isPublic(initMethod.getDeclaringClass().getModifiers())) {
! 			initMethod.setAccessible(true);
! 		}
  		try {
  			initMethod.invoke(bean, (Object[]) null);
--- 1233,1237 ----
  			}
  		}
! 		ReflectionUtils.makeAccessible(initMethod);
  		try {
  			initMethod.invoke(bean, (Object[]) null);

Index: SimpleInstantiationStrategy.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SimpleInstantiationStrategy.java	28 Mar 2007 21:10:39 -0000	1.13
--- SimpleInstantiationStrategy.java	21 May 2007 09:57:26 -0000	1.14
***************
*** 20,24 ****
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
- import java.lang.reflect.Modifier;
  
  import org.springframework.beans.BeanInstantiationException;
--- 20,23 ----
***************
*** 26,29 ****
--- 25,29 ----
  import org.springframework.beans.factory.BeanDefinitionStoreException;
  import org.springframework.beans.factory.BeanFactory;
+ import org.springframework.util.ReflectionUtils;
  import org.springframework.util.StringUtils;
  
***************
*** 112,119 ****
  		try {
  			// It's a static method if the target is null.
! 			if (!Modifier.isPublic(factoryMethod.getModifiers()) ||
! 					!Modifier.isPublic(factoryMethod.getDeclaringClass().getModifiers())) {
! 				factoryMethod.setAccessible(true);
! 			}
  			return factoryMethod.invoke(factoryBean, args);
  		}
--- 112,116 ----
  		try {
  			// It's a static method if the target is null.
! 			ReflectionUtils.makeAccessible(factoryMethod);
  			return factoryMethod.invoke(factoryBean, args);
  		}

Index: DisposableBeanAdapter.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/support/DisposableBeanAdapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DisposableBeanAdapter.java	18 Mar 2007 17:26:05 -0000	1.5
--- DisposableBeanAdapter.java	21 May 2007 09:57:26 -0000	1.6
***************
*** 20,24 ****
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
- import java.lang.reflect.Modifier;
  import java.util.ArrayList;
  import java.util.Iterator;
--- 20,23 ----
***************
*** 32,35 ****
--- 31,35 ----
  import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
  import org.springframework.util.Assert;
+ import org.springframework.util.ReflectionUtils;
  
  /**
***************
*** 188,199 ****
  							args[0] = Boolean.TRUE;
  						}
- 						if (!Modifier.isPublic(destroyMethod.getModifiers()) ||
- 								!Modifier.isPublic(destroyMethod.getDeclaringClass().getModifiers())) {
- 							destroyMethod.setAccessible(true);
- 						}
- 
  						if (logger.isDebugEnabled()) {
  							logger.debug("Invoking custom destroy method on bean with name '" + this.beanName + "'");
  						}
  						try {
  							destroyMethod.invoke(this.bean, args);
--- 188,195 ----
  							args[0] = Boolean.TRUE;
  						}
  						if (logger.isDebugEnabled()) {
  							logger.debug("Invoking custom destroy method on bean with name '" + this.beanName + "'");
  						}
+ 						ReflectionUtils.makeAccessible(destroyMethod);
  						try {
  							destroyMethod.invoke(this.bean, args);