root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

ObjenesisCglibAopProxy defensively catches Throwable 

Issue: SPR-13131
This commit is contained in:
Juergen Hoeller 2015-06-17 17:03:01 +02:00
parent 9f64230131
commit 600e5915b4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java
View File

@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.cglib.proxy.Callback; import org.springframework.cglib.proxy.Callback;
import org.springframework.cglib.proxy.Enhancer; import org.springframework.cglib.proxy.Enhancer;
import org.springframework.cglib.proxy.Factory; import org.springframework.cglib.proxy.Factory;
import org.springframework.objenesis.ObjenesisException;
import org.springframework.objenesis.SpringObjenesis; import org.springframework.objenesis.SpringObjenesis;
/** /**
@ -60,7 +59,7 @@ class ObjenesisCglibAopProxy extends CglibAopProxy {
try { try {
proxyInstance = objenesis.newInstance(proxyClass, enhancer.getUseCache()); proxyInstance = objenesis.newInstance(proxyClass, enhancer.getUseCache());
} }
catch (ObjenesisException ex) { catch (Throwable ex) {
logger.debug("Unable to instantiate proxy using Objenesis, " + logger.debug("Unable to instantiate proxy using Objenesis, " +
"falling back to regular proxy construction", ex); "falling back to regular proxy construction", ex);
} }
@ -73,7 +72,7 @@ class ObjenesisCglibAopProxy extends CglibAopProxy {
proxyClass.getConstructor(this.constructorArgTypes).newInstance(this.constructorArgs) : proxyClass.getConstructor(this.constructorArgTypes).newInstance(this.constructorArgs) :
proxyClass.newInstance()); proxyClass.newInstance());
} }
catch (Exception ex) { catch (Throwable ex) {
throw new AopConfigException("Unable to instantiate proxy using Objenesis, " + throw new AopConfigException("Unable to instantiate proxy using Objenesis, " +
"and regular proxy instantiation via default constructor fails as well", ex); "and regular proxy instantiation via default constructor fails as well", ex);
} }