svn commit: r419863 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: context/ConfigurationContext.java description/AxisOperation.java engine/AddressingBasedDispatcher.java

[deepal]

Author: deepal
Date: Fri Jul  7 03:35:15 2006
New Revision: 419863

URL: http://svn.apache.org/viewvc?rev=419863&view=rev
Log:
- no need to pass message context to get the operation context , message id is 
enough 

Modified:
    
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
    
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
    
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.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=419863&r1=419862&r2=419863&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:35:15 2006
@@ -223,8 +223,8 @@
      * @param msgctx
      * @return Returns OperationContext <code>OperationContext<code>
      */
-    public OperationContext getOperationContext(MessageContext msgctx) {
-        return (OperationContext) 
this.operationContextMap.get(msgctx.getRelatesTo().getValue());
+    public OperationContext getOperationContext(String id) {
+        return (OperationContext) this.operationContextMap.get(id);
     }
 
     public Map getOperationContextMap() {

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=419863&r1=419862&r2=419863&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:35:15 2006
@@ -302,7 +302,7 @@
             ConfigurationContext configContext = 
msgContext.getConfigurationContext();
 
             operationContext =
-                    configContext.getOperationContext(msgContext);
+                    
configContext.getOperationContext(msgContext.getRelatesTo().getValue());
 
             if (null == operationContext) {
                 throw new AxisFault("cannot Correalte Msg " + 
this.getName().toString() + " for the " + msgContext.getRelatesTo().getValue());
@@ -349,7 +349,7 @@
             ConfigurationContext configContext = 
msgContext.getConfigurationContext();
 
             operationContext =
-                    configContext.getOperationContext(msgContext);
+                    
configContext.getOperationContext(msgContext.getRelatesTo().getValue());
 
             if (null == operationContext) {
                 throw new AxisFault(Messages.getMessage("cannotCorrelateMsg",

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=419863&r1=419862&r2=419863&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:35:15 2006
@@ -116,7 +116,7 @@
 
             if ((relatesTo != null) || "".equals(relatesTo)) {
                 OperationContext operationContext =
-                        
msgctx.getConfigurationContext().getOperationContext(msgctx);
+                        
msgctx.getConfigurationContext().getOperationContext(msgctx.getRelatesTo().getValue());
 
                 if (operationContext != null) {
                     
msgctx.setAxisOperation(operationContext.getAxisOperation());



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]