This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch OPENNLP-1619-Fix-possible-NPE-for-PerformanceMonitor-in-Tools in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit 776ee131d498036e5091f4a20f453801dbe140a7 Author: Richard Zowalla <[email protected]> AuthorDate: Tue Oct 8 11:41:05 2024 +0200 OPENNLP-1619 - Fix possible NPE for PerformanceMonitor in *Tools --- .../src/main/java/opennlp/tools/cmdline/chunker/ChunkerMETool.java | 3 +-- .../src/main/java/opennlp/tools/cmdline/parser/ParserTool.java | 3 +-- .../src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java | 3 +-- .../java/opennlp/tools/cmdline/tokenizer/CommandLineTokenizer.java | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerMETool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerMETool.java index e9fdbe30..161b6898 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerMETool.java +++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerMETool.java @@ -59,11 +59,10 @@ public class ChunkerMETool extends BasicCmdLineTool { ChunkerME chunker = new ChunkerME(model); - PerformanceMonitor perfMon = null; + PerformanceMonitor perfMon = new PerformanceMonitor("sent"); try (ObjectStream<String> lineStream = new PlainTextByLineStream( new SystemInputStreamFactory(), SystemInputStreamFactory.encoding())) { - perfMon = new PerformanceMonitor("sent"); perfMon.start(); String line; while ((line = lineStream.read()) != null) { diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java index 90ba1f44..5006d300 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java +++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java @@ -136,11 +136,10 @@ public final class ParserTool extends BasicCmdLineTool { Parser parser = ParserFactory.create(model, beamSize, advancePercentage); - PerformanceMonitor perfMon = null; + PerformanceMonitor perfMon = new PerformanceMonitor("sent"); try (ObjectStream<String> lineStream = new PlainTextByLineStream( new SystemInputStreamFactory(), SystemInputStreamFactory.encoding())) { - perfMon = new PerformanceMonitor("sent"); perfMon.start(); String line; while ((line = lineStream.read()) != null) { diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java index d5e61a1b..df682594 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java +++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java @@ -60,12 +60,11 @@ public final class POSTaggerTool extends BasicCmdLineTool { POSTaggerME tagger = new POSTaggerME(model); - PerformanceMonitor perfMon = null; + PerformanceMonitor perfMon = new PerformanceMonitor("sent"); try (ObjectStream<String> lineStream = new PlainTextByLineStream( new SystemInputStreamFactory(), SystemInputStreamFactory.encoding())) { - perfMon = new PerformanceMonitor("sent"); perfMon.start(); String line; while ((line = lineStream.read()) != null) { diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/CommandLineTokenizer.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/CommandLineTokenizer.java index 9ff6dedf..2b774b5f 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/CommandLineTokenizer.java +++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/CommandLineTokenizer.java @@ -44,7 +44,7 @@ final class CommandLineTokenizer { ObjectStream<String> untokenizedLineStream; ObjectStream<String> tokenizedLineStream; - PerformanceMonitor perfMon = null; + PerformanceMonitor perfMon = new PerformanceMonitor("sent"); try { untokenizedLineStream = new PlainTextByLineStream(new SystemInputStreamFactory(), SystemInputStreamFactory.encoding()); @@ -52,7 +52,6 @@ final class CommandLineTokenizer { tokenizedLineStream = new WhitespaceTokenStream( new TokenizerStream(tokenizer, untokenizedLineStream)); - perfMon = new PerformanceMonitor("sent"); perfMon.start();
