Merge r1446666 from 1.1.x
[OWB-771] keep InvocationContext#getTarget around during catch blocks of InvocationContext#proceed,
our InvocationContextImpl is very short-lived already.
git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/branches/owb_1.0.x@1446673 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
index f1ed888..fed6739 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
@@ -183,8 +183,6 @@
}
catch (InvocationTargetException ite)
{
- this.target = null; // destroy target instance
-
// Try to provide the original exception to the interceptor stack,
// not the InvocationTargetException from Method.invoke
Throwable t = ite.getCause();
@@ -196,8 +194,6 @@
}
catch (Exception e)
{
- this.target = null; // destroy target instance
-
throw e;
}
}
@@ -496,4 +492,4 @@
{
this.ccKey = ccKey;
}
-}
\ No newline at end of file
+}
diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/DependentScopedBean.java b/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/DependentScopedBean.java
index edccae4..5a9b1ae 100644
--- a/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/DependentScopedBean.java
+++ b/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/DependentScopedBean.java
@@ -43,7 +43,13 @@
{
SAY_HELLO = true;
}
-
+
+ @DependentInterceptorBindingType
+ public void throwException()
+ {
+ throw new RuntimeException("goodbye");
+ }
+
@PostConstruct
public void postConstruct()
{
diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java b/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java
index b79f18c..4083b52 100644
--- a/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java
+++ b/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java
@@ -30,6 +30,8 @@
public static boolean DEP_OK = false;
public static int refCount = 0;
+
+ public static Class<?> exceptionTarget = null;
public DependentInterceptor()
{
@@ -41,6 +43,12 @@
{
DEP_OK = true;
- return ctx.proceed();
+ try {
+ return ctx.proceed();
+ }
+ catch (Exception e) {
+ exceptionTarget = ctx.getTarget().getClass();
+ throw e;
+ }
}
}
diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
index 699b9af..42030a3 100644
--- a/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
+++ b/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
@@ -77,6 +77,15 @@
Assert.assertTrue(DependentInterceptor.refCount == 1);
Assert.assertTrue(DependentScopedBean.SAY_HELLO);
+
+ try {
+ dbean.throwException();
+ }
+ catch (Exception e) {
+ Assert.assertNotNull(DependentInterceptor.exceptionTarget);
+ Assert.assertTrue(DependentInterceptor.exceptionTarget.equals(DependentScopedBean.class));
+ }
+
bean.destroy(dbean, ctx);
