svn commit: r736313 - /incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java

[tw...@apache.org]

Author: twgoetz
Date: Wed Jan 21 06:06:17 2009
New Revision: 736313

URL: http://svn.apache.org/viewvc?rev=736313&view=rev
Log:
UIMA-1268: make the pear installer fall back on UTF-8 if it can't guess the text encoding during string replace ops.

https://issues.apache.org/jira/browse/UIMA-1268

Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java?rev=736313&r1=736312&r2=736313&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java Wed Jan 21 06:06:17 2009
@@ -1331,11 +1331,11 @@
     if (".xml".equalsIgnoreCase(fileExt)) {
       // for XML file - supporting UTF-8 (ASCII) and UTF-16 encodings
       String xmlEncoding = XMLUtil.detectXmlFileEncoding(textFile);
-      if (xmlEncoding != null)
+      if (xmlEncoding != null) {
         encoding = xmlEncoding;
-      else
-        throw new UnsupportedEncodingException("can't detect encoding in "
-                + textFile.getAbsolutePath());
+      } else {
+        encoding = "UTF-8";
+      }
     }
     // load text file, using supported encoding
     String fileContent = loadTextFile(textFile, encoding);