4 files changed, 23 insertions, 25 deletions
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
index 50bcf13b04..806feccca2 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
@@ -37,4 +37,26 @@ public interface InterceptorAsync extends Interceptor, InvokerAsyncRequest, Invo
      */
     InvokerAsyncResponse getPrevious();
     
+    /**
+     * Process a request message. Provided so that the synchronous
+     * and asynchronous patterns can re-use the request message
+     * processing 
+     *
+     * @param msg The request Message
+     * @return the processed message
+     * 
+     */
+    Message processRequest(Message msg);
+    
+    /**
+     * Process a response message. Provided so that the synchronous
+     * and asynchronous patterns can re-use the response message
+     * processing 
+     *
+     * @param msg The request Message
+     * @return the processed message
+     * 
+     */
+    Message processResponse(Message msg); 
+
 }
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java
index 5a53504ffb..48fad02b53 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncRequest.java
@@ -36,16 +36,4 @@ public interface InvokerAsyncRequest {
      */
     void invokeAsyncRequest(Message msg);   
 
-    /**
-     * Process a request message. Provided so that the synchronous
-     * and asynchronous patterns can re-use the request message
-     * processing 
-     *
-     * @param msg The request Message
-     * @return the processed message
-     * 
-     */
-    Message processRequest(Message msg);
-      
-
 }
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java
index 1de12638b6..7eeabb760e 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvokerAsyncResponse.java
@@ -36,15 +36,4 @@ public interface InvokerAsyncResponse {
      */
     void invokeAsyncResponse(Message msg);    
     
-    /**
-     * Process a response message. Provided so that the synchronous
-     * and asynchronous patterns can re-use the response message
-     * processing 
-     *
-     * @param msg The request Message
-     * @return the processed message
-     * 
-     */
-    Message processResponse(Message msg);    
-
 }
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
index 9a936bf141..948063f480 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
@@ -136,8 +136,7 @@ public interface Invocable {
      * @return The ticket that can be used to identify this invocation
      * @throws InvocationTargetException
      */
-    void invokeAsync(Operation operation, Message msg) throws Throwable;
-    // TODO - this shouldn't throw an exception
+    void invokeAsync(Operation operation, Message msg);
     
     /**
      * Asynchronously invoke an operation with a context message