svn commit: r1598988 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java

[veithen]

Author: veithen
Date: Sun Jun  1 13:34:11 2014
New Revision: 1598988

URL: http://svn.apache.org/r1598988
Log:
Merged r1598985 to the 1.6 branch for compatibility with future Axiom versions.

Modified:
    axis/axis2/java/sandesha/branches/1_6/   (props changed)
    
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java

Propchange: axis/axis2/java/sandesha/branches/1_6/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/sandesha/trunk:r1598985

Modified: 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java?rev=1598988&r1=1598987&r2=1598988&view=diff
==============================================================================
--- 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
 (original)
+++ 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
 Sun Jun  1 13:34:11 2014
@@ -405,8 +405,6 @@ public class FaultManager {
                faultCode.setSubCode(faultSubCode);
                
                SOAPFaultReason reason = factory.createSOAPFaultReason();
-               SOAPFaultText reasonText = factory.createSOAPFaultText();
-               reasonText.setText(data.getReason());
                
                SOAPFaultDetail detail = factory.createSOAPFaultDetail();
                if (data.getDetail() != null)
@@ -415,6 +413,8 @@ public class FaultManager {
                String SOAPNamespaceValue = factory.getSoapVersionURI();
                
                if 
(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(SOAPNamespaceValue)) {
+                       SOAPFaultText reasonText = 
factory.createSOAPFaultText();
+                       reasonText.setText(data.getReason());
                         reasonText.setLang(Sandesha2Constants.LANG_EN);
                        reason.addSOAPText(reasonText);
                        
referenceRMMsgContext.setProperty(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME, 
faultCode);