[jboss-svn-commits] JBL Code SVN: r38431 - labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/internal/soa/esb/webservice.

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

Author: tcunning
Date: 2013-10-28 16:16:22 -0400 (Mon, 28 Oct 2013)
New Revision: 38431

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
Log:
JBESB-3946
Switch misplaced message creation between SOAP/SOAP12 cases.


Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java	2013-10-28 19:05:26 UTC (rev 38430)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java	2013-10-28 20:16:22 UTC (rev 38431)
@@ -298,7 +298,11 @@
                         else
                         {
                             final Throwable cause = fme.getCause() ;
-                            faultMsg = (cause != null) ? generateFault(isSoap12, cause) : generateFault(isSoap12, ex) ;
+                            if (isSoap12) {
+                                faultMsg = (cause != null) ? generateFault(isSoap12, cause) : generateFault(isSoap12, ex) ;
+                            } else {
+                                faultMsg = (cause != null) ? generateFault(false, cause) : generateFault(false, ex) ;
+                            }
                         }
                     }
                 }
@@ -343,9 +347,9 @@
     {
         SOAPMessage faultMsg = null;
         if (isSoap12) {
+            faultMsg = SOAP_12_MESSAGE_FACTORY.createMessage();
+        } else {
             faultMsg = SOAP_MESSAGE_FACTORY.createMessage() ;
-        } else {
-            faultMsg = SOAP_12_MESSAGE_FACTORY.createMessage();
         }
         if (RETURN_STACK_TRACES)
         {