From 45e9626452e775c5e27015c093650d80cac94521 Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Sat, 4 Jun 2016 03:59:08 +0200
Subject: [PATCH] fixed npe while importing
---
.../src/main/java/de/vipra/cmd/file/FilebaseWordIndex.java | 4 ++--
vipra-cmd/src/main/java/de/vipra/cmd/text/ProcessedText.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vipra-cmd/src/main/java/de/vipra/cmd/file/FilebaseWordIndex.java b/vipra-cmd/src/main/java/de/vipra/cmd/file/FilebaseWordIndex.java
index 51bb48cc..e035f3cc 100644
--- a/vipra-cmd/src/main/java/de/vipra/cmd/file/FilebaseWordIndex.java
+++ b/vipra-cmd/src/main/java/de/vipra/cmd/file/FilebaseWordIndex.java
@@ -53,8 +53,8 @@ public class FilebaseWordIndex implements Iterable<String> {
public String transform(final String[] words, final boolean dbInsert) {
final CountMap<String> countMap = new CountMap<>();
for (final String word : words) {
- if (!word.trim().isEmpty()) {
- countMap.count(word);
+ if (word != null && !word.trim().isEmpty()) {
+ countMap.count(word.trim());
if (dbInsert)
newWords.add(word);
}
diff --git a/vipra-cmd/src/main/java/de/vipra/cmd/text/ProcessedText.java b/vipra-cmd/src/main/java/de/vipra/cmd/text/ProcessedText.java
index 65d93b95..ed941544 100644
--- a/vipra-cmd/src/main/java/de/vipra/cmd/text/ProcessedText.java
+++ b/vipra-cmd/src/main/java/de/vipra/cmd/text/ProcessedText.java
@@ -21,8 +21,8 @@ public class ProcessedText {
final String[] allWords = text.toLowerCase().trim().split("\\s+");
final List<String> wordList = new ArrayList<>(allWords.length);
for (final String word : allWords)
- if (!word.trim().isEmpty())
- wordList.add(word);
+ if (word != null && !word.trim().isEmpty())
+ wordList.add(word.trim());
words = wordList.toArray(new String[allWords.length]);
originalWordCount = wordCount;
reducedWordCount = words.length;
--
GitLab