From 600e5915b41d18a6d9c40d48d5f3c294490cfc8a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 17 Jun 2015 17:03:01 +0200 Subject: [PATCH] ObjenesisCglibAopProxy defensively catches Throwable Issue: SPR-13131 --- .../aop/framework/ObjenesisCglibAopProxy.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java index 24c89065505..0da31db26b7 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java @@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.cglib.proxy.Callback; import org.springframework.cglib.proxy.Enhancer; import org.springframework.cglib.proxy.Factory; -import org.springframework.objenesis.ObjenesisException; import org.springframework.objenesis.SpringObjenesis; /** @@ -60,7 +59,7 @@ class ObjenesisCglibAopProxy extends CglibAopProxy { try { proxyInstance = objenesis.newInstance(proxyClass, enhancer.getUseCache()); } - catch (ObjenesisException ex) { + catch (Throwable ex) { logger.debug("Unable to instantiate proxy using Objenesis, " + "falling back to regular proxy construction", ex); } @@ -73,7 +72,7 @@ class ObjenesisCglibAopProxy extends CglibAopProxy { proxyClass.getConstructor(this.constructorArgTypes).newInstance(this.constructorArgs) : proxyClass.newInstance()); } - catch (Exception ex) { + catch (Throwable ex) { throw new AopConfigException("Unable to instantiate proxy using Objenesis, " + "and regular proxy instantiation via default constructor fails as well", ex); }