You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by tj...@apache.org on 2017/01/13 16:16:23 UTC

svn commit: r1778624 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java

Author: tjwatson
Date: Fri Jan 13 16:16:23 2017
New Revision: 1778624

URL: http://svn.apache.org/viewvc?rev=1778624&view=rev
Log:
[ARIES-1662] Fix behavior when Interceptor.preCall thows exception

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java?rev=1778624&r1=1778623&r2=1778624&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java Fri Jan 13 16:16:23 2017
@@ -58,7 +58,8 @@ public class SingleInterceptorCollaborat
         try {
               callToken = interceptor.preCall(cm, m, parameters);
         } catch (Throwable t) {
-            postInvokeExceptionalReturn(callToken, o, m, t);
+        	// using null token here to be consistent with what Collaborator does
+            postInvokeExceptionalReturn(null, o, m, t);
             throw t;
         }
         return callToken;