You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2012/05/02 19:59:06 UTC
svn commit: r1333127 - in /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util: CasToInlineXml.java TCasToInlineXml.java

Author: schor
Date: Wed May  2 17:59:06 2012
New Revision: 1333127

URL: http://svn.apache.org/viewvc?rev=1333127&view=rev
Log:
[UIMA-2376] use UTF-8 instead of locale for these methods

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java?rev=1333127&r1=1333126&r2=1333127&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java Wed May  2 17:59:06 2012
@@ -20,6 +20,7 @@
 package org.apache.uima.util;
 
 import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -220,9 +221,11 @@ public class CasToInlineXml {
       handler.endDocument();
 
       // return XML string
-      return new String(byteArrayOutputStream.toByteArray());
+      return new String(byteArrayOutputStream.toByteArray(),"UTF-8");
     } catch (SAXException e) {
       throw new UIMARuntimeException(e);
+    } catch (UnsupportedEncodingException e) {
+      throw new UIMARuntimeException(e);
     }
   }
 

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java?rev=1333127&r1=1333126&r2=1333127&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java Wed May  2 17:59:06 2012
@@ -20,6 +20,7 @@
 package org.apache.uima.util;
 
 import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -207,9 +208,11 @@ public class TCasToInlineXml implements 
       handler.endDocument();
 
       // return XML string
-      return new String(byteArrayOutputStream.toByteArray());
+      return new String(byteArrayOutputStream.toByteArray(),"UTF-8");
     } catch (SAXException e) {
       throw new UIMARuntimeException(e);
+    } catch (UnsupportedEncodingException e) {
+      throw new UIMARuntimeException(e);
     }
   }