From c6a1c369e49090b6b9a6f2448045740a368c7ca3 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 13 Nov 2009 17:59:05 +0000 Subject: Remove some of the commented out code that resulted from moving over to the Endpoint/EndpointReference approach. Still some left in that needs looking at. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835940 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/invocation/JavaImplementationInvoker.java | 43 ---------------------- 1 file changed, 43 deletions(-) (limited to 'java/sca/modules/implementation-java-runtime/src/main') diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java index 476ed9ac83..ed7a4d278f 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java @@ -76,43 +76,12 @@ public class JavaImplementationInvoker implements Invoker, DataExchangeSemantics Object contextId = null; EndpointReference from = msg.getFrom(); - /* TODO - EPR - not required for OASIS - ReferenceParameters parameters = null; - if (from != null) { - parameters = from.getReferenceParameters(); - } - - // check what sort of context is required - if (scopeContainer != null) { - Scope scope = scopeContainer.getScope(); - if (scope == Scope.REQUEST) { - contextId = Thread.currentThread(); - } else if (scope == Scope.CONVERSATION && parameters != null) { - contextId = parameters.getConversationID(); - } - } - */ try { // The following call might create a new conversation, as a result, the msg.getConversationID() might // return a new value InstanceWrapper wrapper = scopeContainer.getWrapper(contextId); - // detects whether the scope container has created a conversation Id. This will - // happen in the case that the component has conversational scope but only the - // callback interface is conversational. Or in the callback case if the service interface - // is conversational and the callback interface isn't. If we are in this situation we need - // to get the contextId of this component and remove it after we have invoked the method on - // it. It is possible that the component instance will not go away when it is removed below - // because a callback conversation will still be holding a reference to it - /* TODO - EPR - not required for OASIS - boolean removeTemporaryConversationalComponentAfterCall = false; - if (parameters != null && (contextId == null) && (parameters.getConversationID() != null)) { - contextId = parameters.getConversationID(); - removeTemporaryConversationalComponentAfterCall = true; - } - */ - Object instance = wrapper.getInstance(); // If the method couldn't be computed statically, or the instance being @@ -136,15 +105,6 @@ public class JavaImplementationInvoker implements Invoker, DataExchangeSemantics } scopeContainer.returnWrapper(wrapper, contextId); - - /* TODO - EPR - not required for OASIS - if ((sequence == ConversationSequence.CONVERSATION_END) || (removeTemporaryConversationalComponentAfterCall)) { - // if end conversation, or we have the special case where a conversational - // object was created to service the stateless half of a stateful component - scopeContainer.remove(contextId); - parameters.setConversationID(null); - } - */ msg.setBody(ret); } catch (InvocationTargetException e) { @@ -174,9 +134,6 @@ public class JavaImplementationInvoker implements Invoker, DataExchangeSemantics if (!isChecked && contextId != null) { scopeContainer.remove(contextId); - /* TODO - EPR - not required for OASIS - parameters.setConversationID(null); - */ } } catch (Exception ex){ // TODO - sure what the best course of action is here. We have -- cgit v1.2.3