From 04bcd7752022a41f0b391bb7b9442ddaa3234cca Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Fri, 2 Sep 2011 08:25:39 +0000 Subject: [PATCH] + temporarily revert change --- .../springframework/cache/aspectj/AbstractCacheAspect.aj | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj b/org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj index 9013be49fd..e90d943ba7 100644 --- a/org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj +++ b/org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj @@ -16,6 +16,7 @@ package org.springframework.cache.aspectj; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.Callable; @@ -55,7 +56,7 @@ public abstract aspect AbstractCacheAspect extends CacheAspectSupport { } @SuppressAjWarnings("adviceDidNotMatch") - Object around(final Object cachedObject) : cacheMethodExecution(cachedObject){ + Object around(final Object cachedObject) : cacheMethodExecution(cachedObject) { MethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature(); Method method = methodSignature.getMethod(); @@ -65,7 +66,11 @@ public abstract aspect AbstractCacheAspect extends CacheAspectSupport { } }; - return execute(ajInvocation, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs()); + try{ + return execute(ajInvocation, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs()); + } catch (Exception ex){ + throw new RuntimeException("Cannot cache target ", ex); + } } /**