Ignore (Auto)Closeable for interface-based proxy decisions

jhoeller · jhoeller · commit 118d1470fdaf · 2017-07-19T22:40:45.000+02:00
Issue: SPR-15779
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java
@@ -16,6 +16,8 @@
 
 package org.springframework.aop.framework;
 
+import java.io.Closeable;
+
 import org.springframework.beans.factory.Aware;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.DisposableBean;
@@ -129,8 +131,8 @@ protected void evaluateProxyInterfaces(Class<?> beanClass, ProxyFactory proxyFac
 	 * @return whether the given interface is just a container callback
 	 */
 	protected boolean isConfigurationCallbackInterface(Class<?> ifc) {
-		return (InitializingBean.class == ifc || DisposableBean.class == ifc ||
-				ObjectUtils.containsElement(ifc.getInterfaces(), Aware.class));
+		return (InitializingBean.class == ifc || DisposableBean.class == ifc || Closeable.class == ifc ||
+				AutoCloseable.class == ifc || ObjectUtils.containsElement(ifc.getInterfaces(), Aware.class));
 	}
 
 	/**
