fix NPE while invalidate pinyin found

infinilabs · Aug 26, 2016 · 494dc60 · 494dc60
1 parent 05620aa
commit 494dc60
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/lib/nlp-lang-1.7.jar b/lib/nlp-lang-1.7.jar
diff --git a/src/main/java/org/elasticsearch/index/analysis/PinyinTokenFilter.java b/src/main/java/org/elasticsearch/index/analysis/PinyinTokenFilter.java
@@ -100,7 +100,7 @@ private boolean readTerm() {
                 } else {
 
                     String pinyin = pinyinList.get(i);
-                    if (pinyin != null) {
+                    if (pinyin != null&&pinyin.length()>0) {
 
                         firstLetters.append(pinyin.charAt(0));
 

diff --git a/src/main/java/org/elasticsearch/index/analysis/PinyinTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/PinyinTokenizer.java
@@ -91,7 +91,7 @@ public final boolean incrementToken() throws IOException {
                     } else {
 
                         String pinyin = pinyinList.get(i);
-                        if (pinyin != null) {
+                        if (pinyin != null&&pinyin.length()>0) {
 
                             firstLetters.append(pinyin.charAt(0));
 

diff --git a/src/test/java/org/elasticsearch/index/analysis/PinyinAnalysisTests.java b/src/test/java/org/elasticsearch/index/analysis/PinyinAnalysisTests.java
@@ -346,4 +346,15 @@ private HashMap<String, ArrayList<String>> getStringArrayListHashMap(String[] s,
         }
         return result;
     }
+
+//    @Test
+//    public void TestPinyinFunction() {
+//        List<String> result = Pinyin.pinyin("貌美如誮");
+//        for (int i = 0; i < result.size(); i++) {
+//            String s = result.get(i);
+//            System.out.println(s);
+//        }
+//    }
+
+
 }