You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by gd...@apache.org on 2007/06/07 06:04:36 UTC

svn commit: r545056 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java

Author: gdaniels
Date: Wed Jun  6 21:04:35 2007
New Revision: 545056

URL: http://svn.apache.org/viewvc?view=rev&rev=545056
Log:
Revert last change due to JAXWS breakage.

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java?view=diff&rev=545056&r1=545055&r2=545056
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java Wed Jun  6 21:04:35 2007
@@ -26,6 +26,7 @@
 import org.apache.axiom.soap.SOAPFaultRole;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.soap.SOAPFaultSubCode;
+import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axis2.context.MessageContext;
 
 import javax.xml.namespace.QName;
@@ -201,8 +202,21 @@
         }
 
         if (soapFaultCode != null) {
-            // This works the same regardless of SOAP version
-            faultCode = soapFaultCode.getTextAsQName();
+
+            /////////////////////////////////
+            // This code should be replaced by the paragraph after it - but DOOM needs to be fixed
+            // first.
+            /////////////////////////////////
+            if(soapFaultReason.getNamespace() != null &&
+                    soapFaultReason.getNamespace().getNamespaceURI().equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+                faultCode = soapFaultCode.getValue().getTextAsQName();
+            } else {
+                faultCode = soapFaultCode.getTextAsQName();
+            }
+            /////////////////////////////////
+
+//            // This works the same regardless of SOAP version
+//            faultCode = soapFaultCode.getTextAsQName();
 
             SOAPFaultSubCode subCode = soapFaultCode.getSubCode();
             if (subCode != null) {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org