Author: veithen
Date: Thu Oct 29 20:59:36 2009
New Revision: 831087
URL: http://svn.apache.org/viewvc?rev=831087&view=rev
Log:
Reverted the change in r818346 as discussed on the mailing list. It causes a
regression in Synapse. See SYNAPSE-590.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMSourcedElementTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java?rev=831087&r1=831086&r2=831087&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
Thu Oct 29 20:59:36 2009
@@ -214,7 +214,7 @@
* @return Returns encoding string.
*/
public String getCharSetEncoding() {
- return (this.charSetEncoding !=
null)?this.charSetEncoding:DEFAULT_CHAR_SET_ENCODING;
+ return this.charSetEncoding;
}
public void setCharSetEncoding(String charSetEncoding) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMSourcedElementTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMSourcedElementTest.java?rev=831087&r1=831086&r2=831087&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMSourcedElementTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMSourcedElementTest.java
Thu Oct 29 20:59:36 2009
@@ -139,15 +139,7 @@
String payload = new String(bytes, "utf-16");
assertTrue("The obtained bytes did not match the payload",
payload1.equals(payload));
-
- // Test getting the raw bytes with the default encoding
- OMOutputFormat outputFormat = new OMOutputFormat();
- baos = new ByteArrayOutputStream();
- ds.serialize(baos, outputFormat);
- output = baos.toString(OMOutputFormat.DEFAULT_CHAR_SET_ENCODING);
- System.out.println(output);
- assertTrue("The obtained bytes did not match the payload",
- payload1.equals(output));
+
}
/**
