diff --git a/src/main/java/org/wltea/analyzer/dic/Dictionary.java b/src/main/java/org/wltea/analyzer/dic/Dictionary.java index cf94441..78a0aaa 100644 --- a/src/main/java/org/wltea/analyzer/dic/Dictionary.java +++ b/src/main/java/org/wltea/analyzer/dic/Dictionary.java @@ -296,10 +296,8 @@ public class Dictionary { logger.error("ik-analyzer",e); }finally{ try { - if(is != null){ - is.close(); - is = null; - } + is.close(); + is = null; } catch (IOException e) { logger.error("ik-analyzer",e); } @@ -317,11 +315,14 @@ public class Dictionary { for(String location:remoteExtDictFiles){ logger.info("[Dict Loading] " + location); List lists = getRemoteWords(location); + + /** Redundant Nullcheck as the list is initialized in the getRemoteWords method //如果找不到扩展的字典,则忽略 if(lists == null){ logger.error("[Dict Loading] "+location+"加载失败"); continue; - } + }*/ + for(String theWord:lists){ if (theWord != null && !"".equals(theWord.trim())) { //加载扩展词典数据到主内存词典中 @@ -454,10 +455,8 @@ public class Dictionary { }finally{ try { - if(is != null){ - is.close(); - is = null; - } + is.close(); + is = null; } catch (IOException e) { logger.error("ik-analyzer",e); } @@ -470,11 +469,14 @@ public class Dictionary { for(String location:remoteExtStopWordDictFiles){ logger.info("[Dict Loading] " + location); List lists = getRemoteWords(location); + + /** Redundant Nullcheck as the list is initialized in the getRemoteWords method //如果找不到扩展的字典,则忽略 if(lists == null){ logger.error("[Dict Loading] "+location+"加载失败"); continue; - } + }*/ + for(String theWord:lists){ if (theWord != null && !"".equals(theWord.trim())) { //加载远程词典数据到主内存中 @@ -553,10 +555,8 @@ public class Dictionary { logger.error("ik-analyzer",e); }finally{ try { - if(is != null){ - is.close(); - is = null; - } + is.close(); + is = null; } catch (IOException e) { logger.error("ik-analyzer",e); }