svn commit: r724000 - in /webservices/commons/trunk/modules/axiom/modules: axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/ axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/

[veithen]

Author: veithen
Date: Sat Dec  6 07:34:41 2008
New Revision: 724000

URL: http://svn.apache.org/viewvc?rev=724000&view=rev
Log:
WSCOMMONS-345: Fixed an issue in AXIOMUtil.stringToOM(String) when the XML 
fragment contains non ASCII characters and the platform default charset 
encoding is not UTF-8.

Added:
    
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/
    
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/AXIOMUtilTest.java
Modified:
    
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java?rev=724000&r1=723999&r2=724000&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java
 Sat Dec  6 07:34:41 2008
@@ -21,9 +21,10 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.util.StAXUtils;
 
 import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayInputStream;
+import java.io.StringReader;
 
 public class AXIOMUtil {
 
@@ -36,7 +37,7 @@
      */
     public static OMElement stringToOM(String xmlFragment) throws 
XMLStreamException {
         if (xmlFragment != null) {
-            return new StAXOMBuilder(new 
ByteArrayInputStream(xmlFragment.getBytes()))
+            return new StAXOMBuilder(StAXUtils.createXMLStreamReader(new 
StringReader(xmlFragment)))
                     .getDocumentElement();
         }
         return null;

Added: 
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/AXIOMUtilTest.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/AXIOMUtilTest.java?rev=724000&view=auto
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/AXIOMUtilTest.java
 (added)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/util/AXIOMUtilTest.java
 Sat Dec  6 07:34:41 2008
@@ -0,0 +1,12 @@
+package org.apache.axiom.om.impl.llom.util;
+
+import javax.xml.stream.XMLStreamException;
+
+import junit.framework.TestCase;
+
+public class AXIOMUtilTest extends TestCase {
+       public void testStringToOM() throws XMLStreamException {
+               String testString = "\u00e0 peine arriv\u00e9s nous 
entr\u00e2mes dans sa chambre";
+               assertEquals(testString, AXIOMUtil.stringToOM("<a>" + 
testString + "</a>").getText());
+       }
+}