From 12978b8185bce8b72ad9efbee29950f92f05e0ba Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 19 Jul 2017 22:40:45 +0200 Subject: [PATCH] Ignore (Auto)Closeable for interface-based proxy decisions Issue: SPR-15779 (cherry picked from commit 118d147) --- .../aop/framework/ProxyProcessorSupport.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 index a94c53b1064..2c3de88958d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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; @@ -127,6 +129,7 @@ public class ProxyProcessorSupport extends ProxyConfig implements Ordered, BeanC */ protected boolean isConfigurationCallbackInterface(Class ifc) { return (InitializingBean.class == ifc || DisposableBean.class == ifc || + Closeable.class == ifc || "java.lang.AutoCloseable".equals(ifc.getName()) || ObjectUtils.containsElement(ifc.getInterfaces(), Aware.class)); } @@ -140,7 +143,8 @@ public class ProxyProcessorSupport extends ProxyConfig implements Ordered, BeanC */ protected boolean isInternalLanguageInterface(Class ifc) { return (ifc.getName().equals("groovy.lang.GroovyObject") || - ifc.getName().endsWith(".cglib.proxy.Factory")); + ifc.getName().endsWith(".cglib.proxy.Factory") || + ifc.getName().endsWith(".bytebuddy.MockAccess")); } }