jmsnell 2002/12/04 16:02:06
Modified: java/src/org/apache/axis/ime/internal/util/handler
HandlerMessageExchange.java
java/src/org/apache/axis/ime/internal
FirstComeFirstServeDispatchPolicy.java
SimpleMessageExchangeCorrelator.java
MessageExchangeProvider.java
Log:
Fixed the FirstComeFirstServeDispatchPolicy algorithm
Revision Changes Path
1.7 +3 -1
xml-axis/java/src/org/apache/axis/ime/internal/util/handler/HandlerMessageExchange.java
Index: HandlerMessageExchange.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/util/handler/HandlerMessageExchange.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HandlerMessageExchange.java 4 Dec 2002 21:32:45 -0000 1.6
+++ HandlerMessageExchange.java 5 Dec 2002 00:02:06 -0000 1.7
@@ -97,7 +97,9 @@
}
protected ReceivedMessageDispatchPolicy getReceivedMessageDispatchPolicy() {
- return new FirstComeFirstServeDispatchPolicy(RECEIVE, RECEIVE_REQUESTS);
+ return new FirstComeFirstServeDispatchPolicy(
+ RECEIVE,
+ RECEIVE_REQUESTS);
}
public Handler getSendHandler() {
1.4 +1 -1
xml-axis/java/src/org/apache/axis/ime/internal/FirstComeFirstServeDispatchPolicy.java
Index: FirstComeFirstServeDispatchPolicy.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/FirstComeFirstServeDispatchPolicy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FirstComeFirstServeDispatchPolicy.java 13 Nov 2002 05:24:20 -0000 1.3
+++ FirstComeFirstServeDispatchPolicy.java 5 Dec 2002 00:02:06 -0000 1.4
@@ -101,7 +101,7 @@
context.getMessageExchangeCorrelator();
receiveContext =
(MessageExchangeReceiveContext)RECEIVE_REQUESTS.get(correlator);
if (receiveContext == null) {
- receiveContext = (MessageExchangeReceiveContext)RECEIVE_REQUESTS.get();
+ receiveContext =
(MessageExchangeReceiveContext)RECEIVE_REQUESTS.get(SimpleMessageExchangeCorrelator.NULL_CORRELATOR);
}
if (receiveContext == null)
RECEIVE.put(correlator,context);
1.2 +3 -0
xml-axis/java/src/org/apache/axis/ime/internal/SimpleMessageExchangeCorrelator.java
Index: SimpleMessageExchangeCorrelator.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/SimpleMessageExchangeCorrelator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleMessageExchangeCorrelator.java 4 Dec 2002 04:16:15 -0000 1.1
+++ SimpleMessageExchangeCorrelator.java 5 Dec 2002 00:02:06 -0000 1.2
@@ -66,6 +66,9 @@
public class SimpleMessageExchangeCorrelator
implements MessageExchangeCorrelator {
+ public static final MessageExchangeCorrelator NULL_CORRELATOR =
+ new SimpleMessageExchangeCorrelator(null);
+
private String identifier;
private SimpleMessageExchangeCorrelator() {
1.13 +6 -1
xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeProvider.java
Index: MessageExchangeProvider.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeProvider.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MessageExchangeProvider.java 4 Dec 2002 21:32:45 -0000 1.12
+++ MessageExchangeProvider.java 5 Dec 2002 00:02:06 -0000 1.13
@@ -165,9 +165,14 @@
if (log.isDebugEnabled()) {
log.debug("Enter: MessageExchangeProvider::processReceive");
}
- RECEIVE_REQUESTS.put(
+ if (context.getMessageExchangeCorrelator() != null) {
+ RECEIVE_REQUESTS.put(
context.getMessageExchangeCorrelator(),
context);
+ } else {
+ RECEIVE_REQUESTS.put(
+ SimpleMessageExchangeCorrelator.NULL_CORRELATOR, context);
+ }
if (log.isDebugEnabled()) {
log.debug("Exit: MessageExchangeProvider::processReceive");
}
