You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by hi...@apache.org on 2012/06/12 08:23:38 UTC
svn commit: r1349134 -
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
Author: hiranya
Date: Tue Jun 12 06:23:38 2012
New Revision: 1349134
URL: http://svn.apache.org/viewvc?rev=1349134&view=rev
Log:
Preventing the fault mediator from changing its status at runtime
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java?rev=1349134&r1=1349133&r2=1349134&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java Tue Jun 12 06:23:38 2012
@@ -110,26 +110,23 @@ public class FaultMediator extends Abstr
default : {
// if this is a POX or REST message then make a POX fault
if (synCtx.isDoingPOX() || synCtx.isDoingGET()) {
-
+
makePOXFault(synCtx, synLog);
} else {
-
+
// determine from current message's SOAP envelope namespace
SOAPEnvelope envelop = synCtx.getEnvelope();
if (envelop != null) {
-
+
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
envelop.getNamespace().getNamespaceURI())) {
-
- soapVersion = SOAP12;
makeSOAPFault(synCtx, SOAP12, synLog);
} else {
- soapVersion = SOAP11;
makeSOAPFault(synCtx, SOAP11, synLog);
}
-
+
} else {
// default to SOAP 11
makeSOAPFault(synCtx, SOAP11, synLog);
@@ -245,8 +242,8 @@ public class FaultMediator extends Abstr
}
// populate it
- setFaultCode(synCtx, factory, fault);
- setFaultResaon(synCtx, factory, fault);
+ setFaultCode(synCtx, factory, fault, soapVersion);
+ setFaultReason(synCtx, factory, fault, soapVersion);
setFaultNode(factory, fault);
setFaultRole(factory, fault);
setFaultDetail(synCtx, factory, fault);
@@ -305,7 +302,7 @@ public class FaultMediator extends Abstr
synLog.traceOrDebug("End : Fault mediator");
}
- private void setFaultCode(MessageContext synCtx, SOAPFactory factory, SOAPFault fault) {
+ private void setFaultCode(MessageContext synCtx, SOAPFactory factory, SOAPFault fault, int soapVersion) {
QName fault_code = null;
@@ -319,7 +316,7 @@ public class FaultMediator extends Abstr
}
SOAPFaultCode code = factory.createSOAPFaultCode();
- switch(soapVersion) {
+ switch (soapVersion) {
case SOAP11:
code.setText(fault_code);
break;
@@ -331,7 +328,7 @@ public class FaultMediator extends Abstr
fault.setCode(code);
}
- private void setFaultResaon(MessageContext synCtx, SOAPFactory factory, SOAPFault fault) {
+ private void setFaultReason(MessageContext synCtx, SOAPFactory factory, SOAPFault fault, int soapVersion) {
String reasonString = null;
if (faultReasonValue == null && faultReasonExpr == null) {