You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/06/11 21:57:01 UTC

svn commit: r666812 - in /incubator/tuscany/java/sca: itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/ modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/

Author: rfeng
Date: Wed Jun 11 12:57:01 2008
New Revision: 666812

URL: http://svn.apache.org/viewvc?rev=666812&view=rev
Log:
Fix the test failure in CallBackSetCallbackConv

Modified:
    incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java

Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java?rev=666812&r1=666811&r2=666812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java Wed Jun 11 12:57:01 2008
@@ -148,7 +148,7 @@
         //
         // This should catch an appropriate exception.
         //
-        catch (IllegalArgumentException goodEx)
+        catch (IllegalStateException goodEx)
         {
             System.out.println("correct exception " + goodEx);
             correctException = true;

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java?rev=666812&r1=666811&r2=666812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java Wed Jun 11 12:57:01 2008
@@ -118,7 +118,11 @@
             // compute the method object dynamically for this invocation.
             Method imethod = method;
             if (imethod == null || !imethod.getDeclaringClass().isInstance(instance)) {
-                imethod = JavaInterfaceUtil.findMethod(instance.getClass(), operation);
+                try {
+                    imethod = JavaInterfaceUtil.findMethod(instance.getClass(), operation);
+                } catch (NoSuchMethodException e) {
+                    throw new IllegalArgumentException(e);
+                }
             }
             
             Object ret;