[jboss-svn-commits] JBL Code SVN: r20359 - labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2008-06-06 12:34:35 -0400 (Fri, 06 Jun 2008)
New Revision: 20359

Modified:
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java
Log:
patched to set up reply context using From if no ReplyTo is available

Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java	2008-06-06 15:14:06 UTC (rev 20358)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/AddressingHelper.java	2008-06-06 16:34:35 UTC (rev 20359)
@@ -32,7 +32,11 @@
         // this allows the builder class to be redefined via a property
         AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
         final AddressingProperties responseProperties = builder.newAddressingProperties();
-        responseProperties.initializeAsReply(addressingProperties, false) ;
+        EndpointReference epref = addressingProperties.getReplyTo();
+        if (isNoneAddress(epref)) {
+            epref = addressingProperties.getFrom();
+        }
+        responseProperties.initializeAsDestination(epref);
         responseProperties.setMessageID(makeURI(builder, messageID)) ;
 
         return responseProperties ;
@@ -50,7 +54,11 @@
         // this allows the builder class to be redefined via a property
         AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
         final AddressingProperties responseProperties = builder.newAddressingProperties();
-        responseProperties.initializeAsReply(addressingProperties, false) ;
+        EndpointReference epref = addressingProperties.getReplyTo();
+        if (isNoneAddress(epref)) {
+            epref = addressingProperties.getFrom();
+        }
+        responseProperties.initializeAsDestination(epref);
         responseProperties.setMessageID(makeURI(builder, messageID)) ;
 
         return responseProperties ;
@@ -203,8 +211,11 @@
         // this allows the builder class to be redefined via a property
         AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
         final AddressingProperties requestProperties = builder.newAddressingProperties();
-        requestProperties.initializeAsReply(addressingProperties, false) ;
-
+        EndpointReference epref = addressingProperties.getReplyTo();
+        if (isNoneAddress(epref)) {
+            epref = addressingProperties.getFrom();
+        }
+        requestProperties.initializeAsDestination(epref);
         if (messageID != null)
         {
             requestProperties.setMessageID (makeURI(builder, messageID));