Merge branch 'pr/8' into develop

wyanOrg · Aug 12, 2014 · 84c58e2 · 84c58e2
2 parents 619b5da + 9618759
commit 84c58e2
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/huaban/analysis/jieba/WordDictionary.java b/src/main/java/com/huaban/analysis/jieba/WordDictionary.java
@@ -117,8 +117,13 @@ private String addWord(String word) {
         return r.toString();
     }
 
-
+    
     public void loadUserDict(File userDict) {
+    	loadUserDict(userDict, Charset.forName("UTF-8"));
+    }
+
+
+    public void loadUserDict(File userDict, Charset charset) {
         InputStream is;
         try {
             is = new FileInputStream(userDict);
@@ -128,7 +133,7 @@ public void loadUserDict(File userDict) {
             return;
         }
         try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(is));
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, charset));
             long s = System.currentTimeMillis();
             int count = 0;
             while (br.ready()) {