Author: jmarino
Date: Wed Oct 18 21:00:29 2006
New Revision: 465466
URL: http://svn.apache.org/viewvc?view=rev&rev=465466
Log:
[PATCH] Apply SimplerCompositeReferenceInvocation2.patch for TUSCANY-642 from
Ignacio
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractOperationOutboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationCallbackInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationOutboundInvocationHandler.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/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerInvocationExceptionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractOperationOutboundInvocationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractOperationOutboundInvocationHandler.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractOperationOutboundInvocationHandler.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractOperationOutboundInvocationHandler.java
Wed Oct 18 21:00:29 2006
@@ -46,13 +46,10 @@
}
} else {
msg.setTargetInvoker(invoker);
- msg.setFromAddress(getFromAddress());
Message resp = headInterceptor.invoke(msg);
return resp;
}
}
-
- protected abstract Object getFromAddress();
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java
Wed Oct 18 21:00:29 2006
@@ -41,7 +41,11 @@
}
public Message invoke(Message msg) throws InvocationRuntimeException {
- inboundWire.addMapping(msg.getMessageId(), msg.getFromAddress());
+ Object messageId = msg.getMessageId();
+ // If there is no callback, there may not be a message id
+ if (messageId != null) {
+ inboundWire.addMapping(messageId, msg.getFromAddress());
+ }
return super.invoke(msg);
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationCallbackInvocationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationCallbackInvocationHandler.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationCallbackInvocationHandler.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationCallbackInvocationHandler.java
Wed Oct 18 21:00:29 2006
@@ -50,9 +50,4 @@
TargetInvoker invoker = chain.getTargetInvoker();
return invoke(chain, invoker, msg);
}
-
-
- protected Object getFromAddress() {
- return (inboundWire.getContainer() == null) ? null :
inboundWire.getContainer().getName();
- }
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationOutboundInvocationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationOutboundInvocationHandler.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationOutboundInvocationHandler.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/OperationOutboundInvocationHandler.java
Wed Oct 18 21:00:29 2006
@@ -83,11 +83,10 @@
invoker = chain.getTargetInvoker();
}
- return invoke(chain, invoker, msg);
- }
+ // Setting the from address only needs to happen in the outbound
(forward) direction
+ msg.setFromAddress(fromAddress);
- protected Object getFromAddress() {
- return fromAddress;
+ return invoke(chain, invoker, msg);
}
/**
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=465466&r1=465465&r2=465466
==============================================================================
---
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
Wed Oct 18 21:00:29 2006
@@ -75,10 +75,6 @@
public Object invoke(Method method, Object[] args) throws Throwable {
return invoke(null, method, args);
}
-
- protected Object getFromAddress() {
- return (inboundWire.getContainer() == null) ? null :
inboundWire.getContainer().getName();
- }
protected Object getMessageId() {
return messageId;
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerInvocationExceptionTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerInvocationExceptionTestCase.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerInvocationExceptionTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerInvocationExceptionTestCase.java
Wed Oct 18 21:00:29 2006
@@ -58,7 +58,6 @@
wire = EasyMock.createMock(InboundWire.class);
EasyMock.expect(wire.retrieveMapping(corrId)).andReturn(targetAddress);
EasyMock.expect(wire.getSourceCallbackInvocationChains(targetAddress)).andReturn(chains);
- EasyMock.expect(wire.getContainer()).andReturn(null);
EasyMock.replay(wire);
invoker = new CompositeReferenceCallbackTargetInvoker(operation, wire);
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerTestCase.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerTestCase.java
Wed Oct 18 21:00:29 2006
@@ -77,7 +77,6 @@
wire = EasyMock.createMock(InboundWire.class);
EasyMock.expect(wire.retrieveMapping(corrId)).andReturn(targetAddress);
EasyMock.expect(wire.getSourceCallbackInvocationChains(targetAddress)).andReturn(chains);
- EasyMock.expect(wire.getContainer()).andReturn(null);
EasyMock.replay(wire);
invoker = new CompositeReferenceCallbackTargetInvoker(operation, wire);
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
Wed Oct 18 21:00:29 2006
@@ -89,7 +89,6 @@
wire = EasyMock.createMock(InboundWire.class);
EasyMock.expect(wire.retrieveMapping(corrId)).andReturn(targetAddress);
EasyMock.expect(wire.getSourceCallbackInvocationChains(targetAddress)).andReturn(chains);
- EasyMock.expect(wire.getContainer()).andReturn(null);
EasyMock.replay(wire);
invoker = new CompositeReferenceCallbackTargetInvoker(operation, wire);
}
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java?view=diff&rev=465466&r1=465465&r2=465466
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java
Wed Oct 18 21:00:29 2006
@@ -47,7 +47,10 @@
} else {
Message msg = new MessageImpl();
msg.setTargetInvoker(invoker);
- msg.setFromAddress(getFromAddress());
+ Object fromAddress = getFromAddress();
+ if (fromAddress != null) {
+ msg.setFromAddress(fromAddress);
+ }
Object messageId = getMessageId();
if (messageId == null) {
messageId = new MessageId();
@@ -66,7 +69,10 @@
}
}
- protected abstract Object getFromAddress();
+ protected Object getFromAddress() {
+ // Default to null, only needed in outbound (forward) direction
+ return null;
+ }
protected abstract Object getMessageId();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
