svn commit: r728192 - /ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java

[mriou]

Author: mriou
Date: Fri Dec 19 16:23:08 2008
New Revision: 728192

URL: http://svn.apache.org/viewvc?rev=728192&view=rev
Log:
Another reference that's shared and that gets updated when it shouldn't.

Modified:
    
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java

Modified: 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java?rev=728192&r1=728191&r2=728192&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
 Fri Dec 19 16:23:08 2008
@@ -303,8 +303,9 @@
      */
     private void writeHeader(MessageContext ctxt, PartnerRoleMessageExchange 
odeMex) {
         Options options = ctxt.getOptions();
-        WSAEndpoint targetEPR = EndpointFactory.convertToWSA((MutableEndpoint) 
odeMex.getEndpointReference());
-        WSAEndpoint myRoleEPR = EndpointFactory.convertToWSA((MutableEndpoint) 
odeMex.getMyRoleEndpointReference());
+        WSAEndpoint targetWSAEPR = 
EndpointFactory.convertToWSA((MutableEndpoint) odeMex.getEndpointReference());
+        WSAEndpoint myRoleWSAEPR = 
EndpointFactory.convertToWSA((MutableEndpoint) 
odeMex.getMyRoleEndpointReference());
+        WSAEndpoint targetEPR = new WSAEndpoint(targetWSAEPR);
 
         String partnerSessionId = 
odeMex.getProperty(MessageExchange.PROPERTY_SEP_PARTNERROLE_SESSIONID);
         String myRoleSessionId = 
odeMex.getProperty(MessageExchange.PROPERTY_SEP_MYROLE_SESSIONID);
@@ -317,7 +318,8 @@
         }
         options.setProperty("targetSessionEndpoint", targetEPR);
 
-        if (myRoleEPR != null) {
+        if (myRoleWSAEPR != null) {
+            WSAEndpoint myRoleEPR = new WSAEndpoint(myRoleWSAEPR);
             if (myRoleSessionId != null) {
                 if (__log.isDebugEnabled()) {
                     __log.debug("MyRole session identifier found for myrole 
(callback) WSA endpoint: "
@@ -325,7 +327,7 @@
                 }
                 myRoleEPR.setSessionId(myRoleSessionId);
             }
-            options.setProperty("callbackSessionEndpoint", 
odeMex.getMyRoleEndpointReference());
+            options.setProperty("callbackSessionEndpoint", myRoleEPR);
 
             // Map My Session ID to JMS Correlation ID
             Document callbackEprXml = 
odeMex.getMyRoleEndpointReference().toXML();
@@ -334,11 +336,8 @@
                if (myRoleSessionId != null) {
                    options.setProperty(JMSConstants.JMS_COORELATION_ID, 
myRoleSessionId);
                } else {
-                if (odeMex.getMyRoleEndpointReference() instanceof 
MutableEndpoint) {
-                       WSAEndpoint epr = 
EndpointFactory.convertToWSA((MutableEndpoint) 
odeMex.getMyRoleEndpointReference());
-                       if (epr.getSessionId() != null) {
-                               
options.setProperty(JMSConstants.JMS_COORELATION_ID, myRoleSessionId);
-                       }
+                if (myRoleWSAEPR.getSessionId() != null) {
+                    options.setProperty(JMSConstants.JMS_COORELATION_ID, 
myRoleSessionId);
                 }
                }