svn commit: r1778628 - /aries/branches/java6support/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java

[tjwatson]

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

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

Cherry picked the fix form trunk to the java6support branch

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

Modified: 
aries/branches/java6support/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java
URL: 
http://svn.apache.org/viewvc/aries/branches/java6support/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java?rev=1778628&r1=1778627&r2=1778628&view=diff
==============================================================================
--- 
aries/branches/java6support/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java
 (original)
+++ 
aries/branches/java6support/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/SingleInterceptorCollaborator.java
 Fri Jan 13 16:32: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;