Author: isilval
Date: Thu Nov 9 06:58:12 2006
New Revision: 472931
URL: http://svn.apache.org/viewvc?view=rev&rev=472931
Log:
Using message id from the axis2 message context if there is one
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java?view=diff&rev=472931&r1=472930&r2=472931
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
Thu Nov 9 06:58:12 2006
@@ -50,7 +50,6 @@
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.MessageId;
import org.apache.tuscany.spi.wire.MessageImpl;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireService;
@@ -71,7 +70,7 @@
private WebServiceBinding binding;
- private Map<MessageId, InvocationContext> invCtxMap = new
HashMap<MessageId, InvocationContext>();
+ private Map<Object, InvocationContext> invCtxMap = new HashMap<Object,
InvocationContext>();
private String serviceName;
@@ -245,15 +244,15 @@
return new Axis2ServiceCallbackTargetInvoker(this);
}
- public void addMapping(MessageId msgId, InvocationContext invCtx) {
+ public void addMapping(Object msgId, InvocationContext invCtx) {
this.invCtxMap.put(msgId, invCtx);
}
- public InvocationContext retrieveMapping(MessageId msgId) {
+ public InvocationContext retrieveMapping(Object msgId) {
return this.invCtxMap.get(msgId);
}
- public void removeMapping(MessageId msgId) {
+ public void removeMapping(Object msgId) {
this.invCtxMap.remove(msgId);
}
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java?view=diff&rev=472931&r1=472930&r2=472931
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
Thu Nov 9 06:58:12 2006
@@ -31,7 +31,6 @@
import org.apache.tuscany.binding.axis2.Axis2AsyncTargetInvoker;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.MessageId;
import org.apache.tuscany.spi.wire.TargetInvoker;
public class Axis2ServiceCallbackTargetInvoker implements TargetInvoker {
@@ -46,7 +45,7 @@
throw new InvocationTargetException(new
InvocationRuntimeException("Operation not supported"));
}
- private Object invokeTarget(final Object payload, MessageId correlationId)
throws InvocationTargetException {
+ private Object invokeTarget(final Object payload, Object correlationId)
throws InvocationTargetException {
try {
// Use current correlation id as index to retrieve inv context
InvocationContext invCtx = service.retrieveMapping(correlationId);
@@ -83,7 +82,7 @@
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
- MessageId correlationId = (MessageId)msg.getCorrelationId();
+ Object correlationId = msg.getCorrelationId();
if (correlationId == null) {
throw new InvocationRuntimeException("Missing correlation id");
}
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java?view=diff&rev=472931&r1=472930&r2=472931
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
Thu Nov 9 06:58:12 2006
@@ -47,7 +47,10 @@
public final void receive(final MessageContext messageCtx) {
try {
- MessageId messageId = new MessageId();
+ Object messageId = messageCtx.getMessageID();
+ if (messageId == null) {
+ messageId = new MessageId();
+ }
// Now use message id as index to context to be used by callback
// target invoker
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
