From 413d63675b2918e9f63d5b1e461dcd8158b2130c Mon Sep 17 00:00:00 2001 From: Umit Gunduz Date: Fri, 11 Oct 2019 18:32:26 +0300 Subject: [PATCH] Update Trie.java (#70) * Update Trie.java fix firstMatch NullPointerException * Update Trie.java change for shorter code --- src/main/java/org/ahocorasick/trie/Trie.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/ahocorasick/trie/Trie.java b/src/main/java/org/ahocorasick/trie/Trie.java index 315d749..340b725 100644 --- a/src/main/java/org/ahocorasick/trie/Trie.java +++ b/src/main/java/org/ahocorasick/trie/Trie.java @@ -75,8 +75,8 @@ public class Trie { * @return null if no matches found. */ public Emit firstMatch(final CharSequence text) { - PayloadEmit firstMatch = this.payloadTrie.firstMatch(text); - return new Emit(firstMatch.getStart(), firstMatch.getEnd(), firstMatch.getKeyword()); + final PayloadEmit payload = this.payloadTrie.firstMatch(text); + return payload == null ? null : new Emit(payload.getStart(), payload.getEnd(), payload.getKeyword()); } /**