fixed git merge problem

Former-commit-id: c9b325d28586a399bd666dbe235e73913f26b81e
This commit is contained in:
Jeremy Long
2013-09-02 16:19:47 -04:00
parent c309fa8b20
commit 6f94faee14
2 changed files with 5 additions and 9 deletions

View File

@@ -459,7 +459,7 @@ public class CPEAnalyzer implements Analyzer {
list.add(word);
}
}
if (tempWord != null) {
if (tempWord != null && !list.isEmpty()) {
String tmp = list.get(list.size() - 1) + tempWord;
list.add(tmp);
}