svn commit: r521987 - /webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java

[asankha]

Author: asankha
Date: Fri Mar 23 23:49:21 2007
New Revision: 521987

URL: http://svn.apache.org/viewvc?view=rev&rev=521987
Log:
Applying fix for SYNAPSE-81 from Kasun

Modified:
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java?view=diff&rev=521987&r1=521986&r2=521987
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
 Fri Mar 23 23:49:21 2007
@@ -90,8 +90,10 @@
                 if (envelop != null) {
                     if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
                         envelop.getNamespace().getNamespaceURI())) {
+                        soapVersion = SOAP12;
                         return makeSOAPFault(synCtx, SOAP12,shouldTrace);
                     } else {
+                        soapVersion = SOAP11;
                         return makeSOAPFault(synCtx, SOAP11,shouldTrace);
                     }
                 } else {
@@ -171,8 +173,13 @@
         }
 
         SOAPFaultCode code = factory.createSOAPFaultCode();
-        SOAPFaultValue value = factory.createSOAPFaultValue(code);
-        value.setText(fault_code);
+        switch(soapVersion){
+            case SOAP11:
+                 code.setText(fault_code);
+            case SOAP12:
+                SOAPFaultValue value = factory.createSOAPFaultValue(code);
+                value.setText(fault_code);
+        }
         fault.setCode(code);
     }
 
@@ -188,17 +195,22 @@
         }
 
         SOAPFaultReason reason = factory.createSOAPFaultReason();
-        SOAPFaultText text = factory.createSOAPFaultText();
-        text.setText(reasonString);
-        reason.addSOAPText(text);
+        switch(soapVersion){
+            case SOAP11:
+                reason.setText(reasonString);
+            case SOAP12:
+                SOAPFaultText text = factory.createSOAPFaultText();
+                text.setText(reasonString);
+                reason.addSOAPText(text);
+        }
         fault.setReason(reason);
     }
 
     private void setFaultNode(SOAPFactory factory, SOAPFault fault) {
         if (faultNode != null) {
-            SOAPFaultNode faultNode = factory.createSOAPFaultNode();
-            faultNode.setNodeValue(faultNode.toString());
-            fault.setNode(faultNode);
+            SOAPFaultNode soapfaultNode = factory.createSOAPFaultNode();
+            soapfaultNode.setNodeValue(faultNode.toString());
+            fault.setNode(soapfaultNode);
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]