You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2011/09/16 14:56:24 UTC
svn commit: r1171532 -
/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
Author: slaws
Date: Fri Sep 16 12:56:23 2011
New Revision: 1171532
URL: http://svn.apache.org/viewvc?rev=1171532&view=rev
Log:
TUSCANY-3946 - only reset the TCCL if it's not already set to the contribution classloader
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java?rev=1171532&r1=1171531&r2=1171532&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java Fri Sep 16 12:56:23 2011
@@ -84,7 +84,7 @@ public class JavaImplementationInvoker i
@SuppressWarnings("unchecked")
public Message invoke(Message msg) {
-
+
Operation op = msg.getOperation();
if (op == null) {
op = this.operation;
@@ -104,6 +104,7 @@ public class JavaImplementationInvoker i
return tccl;
}
});
+ ClassLoader contributionClassloader = null;
try {
// The following call might create a new conversation, as a result, the msg.getConversationID() might
@@ -131,17 +132,19 @@ public class JavaImplementationInvoker i
}
}
- // Set the thread context classloader of the thread used to invoke an operation
+ // TUSCANY-3946 - If the TCCL has not already been set to the contribution classloader then
+ // set it so that the thread context classloader of the thread used to invoke an operation
// of a Java POJO component implementation is the class loader of the contribution
- // that contains the POJO implementation class.
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- Thread.currentThread().setContextClassLoader(instance.getClass().getClassLoader());
- return null;
- }
- });
-
-
+ // used to load the POJO implementation class.
+ contributionClassloader = instance.getClass().getClassLoader();
+ if (tccl != contributionClassloader){
+ AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ Thread.currentThread().setContextClassLoader(instance.getClass().getClassLoader());
+ return null;
+ }
+ });
+ }
int argumentHolderCount = 0;
@@ -260,14 +263,16 @@ public class JavaImplementationInvoker i
} catch (Exception e) {
msg.setFaultBody(e);
} finally {
- // set the tccl
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- Thread.currentThread().setContextClassLoader(tccl);
- return null;
- }
- });
-
+ // reset the tccl if it was replaced above
+ // with the contribution classloader
+ if (tccl != contributionClassloader){
+ AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ Thread.currentThread().setContextClassLoader(tccl);
+ return null;
+ }
+ });
+ }
}
return msg;
}