You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/07 06:14:56 UTC
svn commit: r535736 - in
/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi:
RMIBindingInterceptor.java RMIBindingProvider.java
Author: jsdelfino
Date: Sun May 6 21:14:54 2007
New Revision: 535736
URL: http://svn.apache.org/viewvc?view=rev&rev=535736
Log:
Removed dependency on TargetInvoker.
Modified:
incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingInterceptor.java
incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingInterceptor.java?view=diff&rev=535736&r1=535735&r2=535736
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingInterceptor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingInterceptor.java Sun May 6 21:14:54 2007
@@ -22,9 +22,8 @@
import org.apache.tuscany.invocation.Interceptor;
import org.apache.tuscany.invocation.InvocationRuntimeException;
import org.apache.tuscany.invocation.Message;
-import org.apache.tuscany.rmi.RMIHostException;
import org.apache.tuscany.rmi.RMIHost;
-import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.rmi.RMIHostException;
public class RMIBindingInterceptor implements Interceptor {
private RMIHost rmiHost;
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java?view=diff&rev=535736&r1=535735&r2=535736
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java Sun May 6 21:14:54 2007
@@ -47,10 +47,8 @@
import org.apache.tuscany.invocation.InvocationChain;
import org.apache.tuscany.invocation.Message;
import org.apache.tuscany.invocation.MessageImpl;
-import org.apache.tuscany.invocation.TargetInvoker;
-import org.apache.tuscany.rmi.RMIHostException;
import org.apache.tuscany.rmi.RMIHost;
-import org.apache.tuscany.scope.Scope;
+import org.apache.tuscany.rmi.RMIHostException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.WorkContextTunnel;
@@ -208,33 +206,19 @@
Interceptor headInterceptor = chain.getHeadInterceptor();
WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
- String oldConversationID = (String) workContext.getIdentifier(Scope.CONVERSATION);
-
- try {
- if (headInterceptor == null) {
- // short-circuit the dispatch and invoke the target directly
- TargetInvoker targetInvoker = chain.getTargetInvoker();
- if (targetInvoker == null) {
- throw new AssertionError("No target invoker [" + chain.getTargetOperation().getName() + "]");
- }
- return targetInvoker.invokeTarget(args, TargetInvoker.NONE, null);
- } else {
- Message msg = new MessageImpl();
- msg.setTargetInvoker(chain.getTargetInvoker());
- msg.setBody(args);
- msg.setWorkContext(workContext);
-
- Message resp;
- // dispatch the wire down the chain and get the response
- resp = headInterceptor.invoke(msg);
- Object body = resp.getBody();
- if (resp.isFault()) {
- throw new InvocationTargetException((Throwable) body);
- }
- return body;
- }
- } finally {
+ Message msg = new MessageImpl();
+ msg.setTargetInvoker(chain.getTargetInvoker());
+ msg.setBody(args);
+ msg.setWorkContext(workContext);
+
+ Message resp;
+ // dispatch the wire down the chain and get the response
+ resp = headInterceptor.invoke(msg);
+ Object body = resp.getBody();
+ if (resp.isFault()) {
+ throw new InvocationTargetException((Throwable) body);
}
+ return body;
}
protected int getPort(String port) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org