snichol 2002/10/18 06:52:30
Modified: java/src/org/apache/soap Fault.java SOAPException.java
Log:
SOAPException does not need to use cleanString. Removed its use there
and added it to marshalling for Fault, where it is needed. Thanks to
Pavel Ausianik for getting me to think about how easy it would be to
stop the unpleasant formatting of client SOAP exceptions.
Revision Changes Path
1.10 +3 -3 xml-soap/java/src/org/apache/soap/Fault.java
Index: Fault.java
===================================================================
RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/Fault.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Fault.java 21 Aug 2001 21:25:57 -0000 1.9
+++ Fault.java 18 Oct 2002 13:52:30 -0000 1.10
@@ -188,17 +188,17 @@
attrHandler.marshall(sink, ctx);
sink.write('>' + StringUtils.lineSeparator +
- '<' + Constants.ELEM_FAULT_CODE + '>' + faultCode +
+ '<' + Constants.ELEM_FAULT_CODE + '>' + Utils.cleanString(faultCode)
+
"</" + Constants.ELEM_FAULT_CODE + '>' +
StringUtils.lineSeparator +
- '<' + Constants.ELEM_FAULT_STRING + '>' + faultString +
+ '<' + Constants.ELEM_FAULT_STRING + '>' +
Utils.cleanString(faultString) +
"</" + Constants.ELEM_FAULT_STRING + '>' +
StringUtils.lineSeparator);
// Generate the <faultactor> element if a value is present.
if (faultActorURI != null)
{
- sink.write('<' + Constants.ELEM_FAULT_ACTOR + '>' + faultActorURI +
+ sink.write('<' + Constants.ELEM_FAULT_ACTOR + '>' +
Utils.cleanString(faultActorURI) +
"</" + Constants.ELEM_FAULT_ACTOR + '>' +
StringUtils.lineSeparator);
}
1.5 +5 -4 xml-soap/java/src/org/apache/soap/SOAPException.java
Index: SOAPException.java
===================================================================
RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/SOAPException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPException.java 24 Sep 2001 19:45:13 -0000 1.4
+++ SOAPException.java 18 Oct 2002 13:52:30 -0000 1.5
@@ -62,24 +62,25 @@
*
* @author Sanjiva Weerawarana ([EMAIL PROTECTED])
* @author Matthew J. Duftler ([EMAIL PROTECTED])
+ * @author Scott Nichol ([EMAIL PROTECTED])
*/
public class SOAPException extends Exception {
private String faultCode;
private Throwable targetException;
public SOAPException (String faultCode, String msg) {
- super (Utils.cleanString (msg));
- this.faultCode = Utils.cleanString (faultCode);
+ super(msg);
+ this.faultCode = faultCode;
}
public SOAPException (String faultCode, String msg,
Throwable targetException) {
- this (faultCode, msg);
+ this(faultCode, msg);
this.targetException = targetException;
}
public void setFaultCode (String faultCode) {
- this.faultCode = Utils.cleanString (faultCode);
+ this.faultCode = faultCode;
}
public String getFaultCode () {
--
To unsubscribe, e-mail: <mailto:soap-dev-unsubscribe@;xml.apache.org>
For additional commands, e-mail: <mailto:soap-dev-help@;xml.apache.org>
