Author: deepal
Date: Fri Jul 7 03:03:40 2006
New Revision: 419854
URL: http://svn.apache.org/viewvc?rev=419854&view=rev
Log:
- fixing bug introduced due to my changes yesterday (register operation context)
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
Fri Jul 7 03:03:40 2006
@@ -224,10 +224,7 @@
* @return Returns OperationContext <code>OperationContext<code>
*/
public OperationContext getOperationContext(MessageContext msgctx) {
- String id = msgctx.getRelatesTo().getValue() + ":" +
- msgctx.getAxisOperation().getMessageExchangePattern();
- //String messageID
- return (OperationContext) this.operationContextMap.get(id);
+ return (OperationContext)
this.operationContextMap.get(msgctx.getRelatesTo().getValue());
}
public Map getOperationContextMap() {
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
Fri Jul 7 03:03:40 2006
@@ -105,8 +105,7 @@
MessageContext messageContext = (MessageContext)
msgContexts.next();
if ((null != messageContext) && (operationContextMap != null)) {
- operationContextMap.remove(messageContext.getMessageID() + ":"
- + getAxisOperation().getMessageExchangePattern());
+ operationContextMap.remove(messageContext.getMessageID());
}
}
}
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
Fri Jul 7 03:03:40 2006
@@ -356,9 +356,6 @@
this.getName().toString(),
msgContext.getRelatesTo().getValue()));
}
}
-
- registerOperationContext(msgContext, operationContext);
-
return operationContext;
}
@@ -366,9 +363,18 @@
OperationContext operationContext)
throws AxisFault {
msgContext.setAxisOperation(this);
-
msgContext.getConfigurationContext().registerOperationContext(msgContext.getMessageID()
- + ":" + this.getMessageExchangePattern(),
+
msgContext.getConfigurationContext().registerOperationContext(msgContext.getMessageID(),
operationContext);
+ operationContext.addMessageContext(msgContext);
+ msgContext.setOperationContext(operationContext);
+ if (operationContext.isComplete()) {
+ operationContext.cleanup();
+ }
+ }
+
+ public void registerMessageContext(MessageContext msgContext,
+ OperationContext operationContext)
throws AxisFault {
+ msgContext.setAxisOperation(this);
operationContext.addMessageContext(msgContext);
msgContext.setOperationContext(operationContext);
if (operationContext.isComplete()) {
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
Fri Jul 7 03:03:40 2006
@@ -272,7 +272,6 @@
//HTTP
mc.setProperty(MessageContext.TRANSPORT_NON_BLOCKING,
Boolean.TRUE);
AxisEngine engine = new AxisEngine(cc);
-
sc.getAxisService().mapActionToOperation(mc.getSoapAction(),axisOp);
mc.getConfigurationContext().registerOperationContext(mc.getMessageID(), oc);
engine.send(mc);
} else {
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
Fri Jul 7 03:03:40 2006
@@ -108,7 +108,7 @@
public void invoke(MessageContext msgctx) throws AxisFault {
// first check we can dispatch using the relates to
- if (msgctx.getRelatesTo() != null && msgctx.getAxisOperation() !=
null) {
+ if (msgctx.getRelatesTo() != null) {
String relatesTo = msgctx.getRelatesTo().getValue();
log.debug(Messages.getMessage("checkingrelatesto",
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
(original)
+++
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
Fri Jul 7 03:03:40 2006
@@ -87,7 +87,7 @@
} else { // 2. if null, create new opCtxt
operationContext = new OperationContext(axisOperation);
- axisOperation.registerOperationContext(msgContext,
operationContext);
+ axisOperation.registerMessageContext(msgContext, operationContext);
if (serviceContext != null) {
// no need to added to configuration conetxt , since we are
happy in
// storing in session context
Modified:
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
(original)
+++
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
Fri Jul 7 03:03:40 2006
@@ -57,6 +57,7 @@
msgctx.setConfigurationContext(configurationContext);
OperationContext opContext = axisOperation.findOperationContext(msgctx,
serviceContext);
+ axisOperation.registerOperationContext(msgctx,opContext);
msgctx.setServiceContext(serviceContext);
// test the complte Hierarchy built
Modified:
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=419854&r1=419853&r2=419854&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
(original)
+++
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
Fri Jul 7 03:03:40 2006
@@ -53,6 +53,7 @@
AxisOperation axisOperation = new InOutAxisOperation(new
QName("test"));
OperationContext operationContext1 = axisOperation
.findOperationContext(messageContext1, sessionContext);
+
axisOperation.registerOperationContext(messageContext1,operationContext1);
MessageContext messageContext2 = this.getBasicMessageContext();
messageContext2.setMessageID(UUIDGenerator.getUUID());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
