Apply getInterfaceMethodIfPossible without SecurityManager as well

Closes gh-23323
spring-projects · Jul 20, 2019 · 4a09b32 · 4a09b32
1 parent 209c850
commit 4a09b32
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...in/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/...in/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -1882,10 +1882,9 @@ protected void invokeCustomInitMethod(String beanName, final Object bean, RootBe
 		if (logger.isTraceEnabled()) {
 			logger.trace("Invoking init method  '" + initMethodName + "' on bean with name '" + beanName + "'");
 		}
+		Method methodToInvoke = ClassUtils.getInterfaceMethodIfPossible(initMethod);
 
 		if (System.getSecurityManager() != null) {
-			Method methodToInvoke = ClassUtils.getInterfaceMethodIfPossible(initMethod);
-
 			AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
 				ReflectionUtils.makeAccessible(methodToInvoke);
 				return null;
@@ -1901,8 +1900,8 @@ protected void invokeCustomInitMethod(String beanName, final Object bean, RootBe
 		}
 		else {
 			try {
-				ReflectionUtils.makeAccessible(initMethod);
-				initMethod.invoke(bean);
+				ReflectionUtils.makeAccessible(methodToInvoke);
+				methodToInvoke.invoke(bean);
 			}
 			catch (InvocationTargetException ex) {
 				throw ex.getTargetException();