[jboss-svn-commits] JBL Code SVN: r28839 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna: wst11/messaging and 1 other directory.

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

Author: adinn
Date: 2009-08-05 10:30:41 -0400 (Wed, 05 Aug 2009)
New Revision: 28839

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java
Log:
corrected handlign of unknown participant to send soap fault without trying to use endpoint -- fixes JBTM-600

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java	2009-08-05 13:48:56 UTC (rev 28838)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java	2009-08-05 14:30:41 UTC (rev 28839)
@@ -147,6 +147,22 @@
     }
 
     /**
+     * Send a fault for an unknown participant.
+     * @param map The addressing context.
+     * @param soapFault The SOAP fault.
+     * @param identifier The arjuna instance identifier.
+     * @throws com.arjuna.webservices.SoapFault For any errors.
+     * @throws java.io.IOException for any transport errors.
+     */
+    public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault soapFault, final InstanceIdentifier identifier)
+        throws SoapFault, IOException
+    {
+        AddressingHelper.installNoneReplyTo(addressingProperties);
+        // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
+        SoapFaultClient.sendSoapFault((SoapFault11)soapFault, addressingProperties, faultAction);
+    }
+
+    /**
      * return a completion coordinator endpoint appropriate to the type of completion initiator
      * @param participant
      * @return either the secure terminaton participant endpoint or the non-secure endpoint

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java	2009-08-05 13:48:56 UTC (rev 28838)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CompletionCoordinatorProcessorImpl.java	2009-08-05 14:30:41 UTC (rev 28839)
@@ -140,7 +140,7 @@
                 final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
                 final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
                         WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_5")) ;
-                CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
+                CompletionInitiatorClient.getClient().sendSoapFault(faultAddressingContext, soapFault, instanceIdentifier) ;
             }
         }
         catch (Throwable throwable)
@@ -210,7 +210,7 @@
                 final AddressingProperties faultAddressingContext = AddressingHelper.createFaultContext(addressingProperties, MessageId.getMessageId()) ;
                 final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNTRANSACTION_ERROR_CODE_QNAME,
                     WSTLogger.log_mesg.getString("com.arjuna.wst11.messaging.CompletionCoordinatorProcessorImpl_10")) ;
-                CompletionInitiatorClient.getClient().sendSoapFault(participant.getParticipant(), faultAddressingContext, soapFault, instanceIdentifier) ;
+                CompletionInitiatorClient.getClient().sendSoapFault(faultAddressingContext, soapFault, instanceIdentifier) ;
             }
         }
         catch (Throwable throwable)