You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/11/23 17:43:41 UTC
svn commit: r478614 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/component/
core/src/main/java/org/apache/tuscany/core/wire/
core/src/main/java/org/apache/tuscany/core/wire/jdk/
core/src/test/java/org/apache/tusca...
Author: jmarino
Date: Thu Nov 23 08:43:36 2006
New Revision: 478614
URL: http://svn.apache.org/viewvc?view=rev&rev=478614
Log:
remove unneeded message id from WorkContext
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireInvocationHandler.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java Thu Nov 23 08:43:36 2006
@@ -32,18 +32,11 @@
* @version $Rev$ $Date$
*/
public class WorkContextImpl implements WorkContext {
-
private static final Object REMOTE_CONTEXT = new Object();
- private static final Object MESSAGE_ID = new Object();
private static final Object CORRELATION_ID = new Object();
private static final Object CALLBACK_ROUTING_CHAIN = new Object();
- // TODO implement propagation strategy for creating new threads
-
- //A map ( associated with the current thread) of scope identifiers keyed on the event context id type.
- //The scope identifier may be a {@link ScopeIdentifier} or an opaque id
-
- // [rfeng] We cannot use InheritableThreadLocal for message ids here since it's shared by parent and children
+ // [rfeng] We cannot use InheritableThreadLocal for message ids here since it's shared by parent and children
private ThreadLocal<Map<Object, Object>> workContext = new ThreadLocal<Map<Object, Object>>();
// [rfeng] Session id requires InheritableThreadLocal
@@ -51,23 +44,6 @@
public WorkContextImpl() {
super();
- }
-
- public Object getCurrentMessageId() {
- Map<Object, Object> map = workContext.get();
- if (map == null) {
- return null;
- }
- return map.get(MESSAGE_ID);
- }
-
- public void setCurrentMessageId(Object messageId) {
- Map<Object, Object> map = workContext.get();
- if (map == null) {
- map = new IdentityHashMap<Object, Object>();
- workContext.set(map);
- }
- map.put(MESSAGE_ID, messageId);
}
public Object getCurrentCorrelationId() {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java Thu Nov 23 08:43:36 2006
@@ -68,7 +68,6 @@
try {
workScheduler.scheduleWork(new Runnable() {
public void run() {
- workContext.setCurrentMessageId(null);
workContext.setCurrentCorrelationId(null);
// if we got a conversation id, transfer it to new thread
if (conversationID != null) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java Thu Nov 23 08:43:36 2006
@@ -44,8 +44,8 @@
public class JDKCallbackInvocationHandler extends AbstractOutboundInvocationHandler
implements WireInvocationHandler, InvocationHandler {
- private WorkContext context;
- private InboundWire inboundWire;
+ private transient WorkContext context;
+ private transient InboundWire inboundWire;
public JDKCallbackInvocationHandler(WorkContext context, InboundWire inboundWire) {
this.context = context;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java Thu Nov 23 08:43:36 2006
@@ -39,6 +39,7 @@
*/
public class JDKInboundInvocationHandler extends AbstractInboundInvocationHandler
implements WireInvocationHandler, InvocationHandler {
+ private static final long serialVersionUID = -307902641125881043L;
/*
* an association of an operation to chain holder. The holder contains the invocation chain
@@ -99,7 +100,6 @@
assert chain != null;
invoker = chain.getTargetInvoker();
}
- context.setCurrentMessageId(null);
context.setCurrentCorrelationId(null);
return invoke(chain, invoker, args);
}
@@ -108,6 +108,8 @@
public Object invoke(Method method, Object[] args) throws Throwable {
return invoke(null, method, args);
}
+
+
/**
* A holder used to associate an wire chain with a local copy of a target invoker that was previously cloned from
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java Thu Nov 23 08:43:36 2006
@@ -88,33 +88,25 @@
WorkContext ctx = new WorkContextImpl();
assertNull(ctx.getIdentifier(this));
}
-
+
public void testSetGetMessageIds() {
WorkContext context = new WorkContextImpl();
- context.setCurrentMessageId("msg-009");
context.setCurrentCorrelationId("msg-005");
- assertEquals(context.getCurrentMessageId(), "msg-009");
assertEquals(context.getCurrentCorrelationId(), "msg-005");
- context.setCurrentMessageId(null);
context.setCurrentCorrelationId(null);
- assertNull(context.getCurrentMessageId());
assertNull(context.getCurrentCorrelationId());
}
public void testSetGetMessageIdsInNewThread() throws InterruptedException {
WorkContext context = new WorkContextImpl();
- context.setCurrentMessageId("msg-009");
context.setCurrentCorrelationId("msg-005");
- assertEquals(context.getCurrentMessageId(), "msg-009");
assertEquals(context.getCurrentCorrelationId(), "msg-005");
context.setIdentifier("TX", "002");
ChildThread t = new ChildThread(context);
t.start();
t.join();
assertTrue(t.passed);
- context.setCurrentMessageId(null);
context.setCurrentCorrelationId(null);
- assertNull(context.getCurrentMessageId());
assertNull(context.getCurrentCorrelationId());
}
@@ -129,7 +121,7 @@
@Override
public void run() {
try {
- assertNull(context.getCurrentMessageId());
+ //assertNull(context.getCurrentMessageId());
assertNull(context.getCurrentCorrelationId());
assertEquals("002", context.getIdentifier("TX"));
} catch (AssertionError e) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java Thu Nov 23 08:43:36 2006
@@ -70,7 +70,6 @@
msg.setMessageId(id);
WorkContext context = createMock(WorkContext.class);
- context.setCurrentMessageId(null);
context.setCurrentCorrelationId(id);
replay(context);
Method method = AsyncTarget.class.getMethod("invoke");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java Thu Nov 23 08:43:36 2006
@@ -54,7 +54,6 @@
WorkContext context = createMock(WorkContext.class);
String convID = "convID";
EasyMock.expect(context.getIdentifier(Scope.CONVERSATIONAL)).andReturn(convID);
- context.setCurrentMessageId(null);
context.setCurrentCorrelationId(null);
context.setIdentifier(Scope.CONVERSATIONAL, convID);
EasyMock.replay(context);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java Thu Nov 23 08:43:36 2006
@@ -27,19 +27,15 @@
*/
public interface WorkContext {
- Object getCurrentMessageId();
-
- void setCurrentMessageId(Object messageId);
-
Object getCurrentCorrelationId();
void setCurrentCorrelationId(Object correlationId);
-
+
/**
* Returns the current chain of SCAObject addresses
*/
LinkedList<Object> getCurrentCallbackRoutingChain();
-
+
/**
* Sets the current stack of SCAObject addresses
*/
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java Thu Nov 23 08:43:36 2006
@@ -54,7 +54,6 @@
try {
Object messageId = msg.getMessageId();
if (messageId != null) {
- workContext.setCurrentMessageId(null);
workContext.setCurrentCorrelationId(messageId);
}
LinkedList<Object> callbackRoutingChain = msg.getCallbackRoutingChain();
@@ -64,7 +63,6 @@
Object resp = invokeTarget(msg.getBody());
msg.setBody(resp);
} catch (InvocationTargetException e) {
- //monitor.executionError(e);
msg.setBodyWithFault(e.getCause());
}
return msg;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireInvocationHandler.java?view=diff&rev=478614&r1=478613&r2=478614
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireInvocationHandler.java Thu Nov 23 08:43:36 2006
@@ -19,13 +19,14 @@
package org.apache.tuscany.spi.wire;
import java.lang.reflect.Method;
+import java.io.Serializable;
/**
* Implementations are responsible for dispatching an operation down an invocation chain
*
* @version $$Rev$$ $$Date$$
*/
-public interface WireInvocationHandler {
+public interface WireInvocationHandler extends Serializable {
Object invoke(Method method, Object[] args) throws Throwable;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org