You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/07/07 14:12:13 UTC

svn commit: r1358551 - /lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java

Author: rmuir
Date: Sat Jul  7 12:12:13 2012
New Revision: 1358551

URL: http://svn.apache.org/viewvc?rev=1358551&view=rev
Log:
LUCENE-4199: don't use default charset

Modified:
    lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java

Modified: lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java?rev=1358551&r1=1358550&r2=1358551&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java (original)
+++ lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java Sat Jul  7 12:12:13 2012
@@ -38,6 +38,8 @@ import java.util.List;
 import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 
+import org.apache.lucene.util.IOUtils;
+
 /**
  * Implementation of a Ternary Search Trie, a data structure for storing
  * <code>String</code> objects that combines the compact size of a binary search
@@ -196,10 +198,10 @@ public class JaspellTernarySearchTrie {
     this();
     BufferedReader in;
     if (compression)
-      in = new BufferedReader(new InputStreamReader(new GZIPInputStream(
-              new FileInputStream(file))));
-    else in = new BufferedReader(new InputStreamReader((new FileInputStream(
-            file))));
+      in = new BufferedReader(IOUtils.getDecodingReader(new GZIPInputStream(
+              new FileInputStream(file)), IOUtils.CHARSET_UTF_8));
+    else in = new BufferedReader(IOUtils.getDecodingReader((new FileInputStream(
+            file)), IOUtils.CHARSET_UTF_8));
     String word;
     int pos;
     Float occur, one = new Float(1);