diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-13 19:58:29 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-13 19:58:29 +0000 |
commit | ca5efc2fe6a0b714f64bdda4dbb6c3d92eb8a2e9 (patch) | |
tree | 4d28fe10de085f3a7ff9031ab49f7369d9b0f757 /sca-java-2.x/trunk/modules/core/src/main/java | |
parent | 9dc381f1ac6bfd7e6bc19f3e7560d085c4f84c9a (diff) |
TUSCANY-3872: Apply patch from Greg Dritschler to fix AsyncJDKInvocationHandler should short-circuit Object methods
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1135253 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/core/src/main/java')
-rw-r--r-- | sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java index a36ee8d2f8..e46b2b7046 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java @@ -148,6 +148,10 @@ public class AsyncJDKInvocationHandler extends JDKInvocationHandler { @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if (Object.class == method.getDeclaringClass()) { + return invokeObjectMethod(method, args); + } + // force the bind of the reference so that we can look at the // target contract to see if it's asynchronous source.getInvocationChains(); |