修复词典reload的空指针异常

kashwy · Jan 5, 2017 · 0113a3c · 0113a3c
1 parent 1b508d2
commit 0113a3c
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 11 deletions.
diff --git a/library/ambiguity.dic b/library/ambiguity.dic
@@ -5,4 +5,7 @@
 大	a	和尚	n
 张三	nr	和	c
 动漫	n	游戏	n
-邓颖超	nr	生前	t 
+邓颖超	nr	生前	t 
+
+
+
diff --git a/plugin/ansj_lucene5_plugin/src/test/java/org/ansj/ansj_lucene5_plug/TestToken.java b/plugin/ansj_lucene5_plugin/src/test/java/org/ansj/ansj_lucene5_plug/TestToken.java
@@ -26,7 +26,7 @@ public static void main(String[] args) {
 
 		Map<String, String> map = new HashMap<String, String>();
 
-		map.put("type", TYPE.index.name());
+		map.put("type", "dic_ansj");
 		map.put(SynonymsLibrary.DEFAULT, SynonymsLibrary.DEFAULT);
 
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>ansj_seg</artifactId>
 	<packaging>jar</packaging>
 	<name>ansj_seg</name>
-	<version>5.1.0</version>
+	<version>5.1.1</version>
 	<description>best java chinese word seg ! </description>
 	<url>https://github.com/NLPchina/ansj_seg</url>
 	<licenses>

diff --git a/src/main/java/org/ansj/library/AmbiguityLibrary.java b/src/main/java/org/ansj/library/AmbiguityLibrary.java
@@ -180,7 +180,10 @@ public static KV<String, Forest> remove(String key) {
 	 * @return
 	 */
 	public static void reload(String key) {
-		AMBIGUITY.get(key).setV(null);
+		KV<String, Forest> kv = AMBIGUITY.get(key);
+		if (kv != null) {
+			AMBIGUITY.get(key).setV(null);
+		}
 		get(key);
 	}
 

diff --git a/src/main/java/org/ansj/library/CrfLibrary.java b/src/main/java/org/ansj/library/CrfLibrary.java
@@ -3,8 +3,8 @@
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.ansj.app.crf.Model;
 import org.ansj.app.crf.SplitWord;
@@ -123,8 +123,10 @@ public static KV<String, SplitWord> remove(String key) {
 	 * @return
 	 */
 	public static void reload(String key) {
-
-		CRF.get(key).setV(null);
+		KV<String, SplitWord> kv = CRF.get(key);
+		if (kv != null) {
+			CRF.get(key).setV(null);
+		}
 		get(key);
 	}
 

diff --git a/src/main/java/org/ansj/library/DicLibrary.java b/src/main/java/org/ansj/library/DicLibrary.java
@@ -254,7 +254,10 @@ public static Set<String> keys() {
 	}
 
 	public static void reload(String key) {
-		DIC.get(key).setV(null);
+		KV<String, Forest> kv = DIC.get(key);
+		if (kv != null) {
+			DIC.get(key).setV(null);
+		}
 		get(key);
 	}
 

diff --git a/src/main/java/org/ansj/library/StopLibrary.java b/src/main/java/org/ansj/library/StopLibrary.java
@@ -231,7 +231,10 @@ public static Set<String> keys() {
 	}
 
 	public static void reload(String key) {
-		STOP.get(key).setV(null);
+		KV<String, StopRecognition> kv = STOP.get(key);
+		if (kv != null) {
+			STOP.get(key).setV(null);
+		}
 		get(key);
 	}
 

diff --git a/src/main/java/org/ansj/library/SynonymsLibrary.java b/src/main/java/org/ansj/library/SynonymsLibrary.java
@@ -146,8 +146,10 @@ public static KV<String, SmartForest<List<String>>> remove(String key) {
 	 * @return
 	 */
 	public static void reload(String key) {
-
-		SYNONYMS.get(key).setV(null);
+		KV<String, SmartForest<List<String>>> kv = SYNONYMS.get(key);
+		if (kv != null) {
+			SYNONYMS.get(key).setV(null);
+		}
 		get(key);
 	}