From f6625e8ce4b0ecb1dccfd56c33eaa2477c3e37e3 Mon Sep 17 00:00:00 2001 From: Gabriel Einsdorf Date: Wed, 2 Mar 2016 14:06:15 -0600 Subject: [PATCH] Fix NPE when reader reads null line. Old code called trim() on ``line``, and tested for ``line == null`` afterwards. If ``line`` is actually ``null`` this will cause an ``NullPointerException`` --- .../java/org/scijava/plugins/scripting/java/JavaEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java b/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java index 02874d5..7ef7b91 100644 --- a/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java +++ b/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java @@ -550,8 +550,9 @@ private static String getFullClassName(final File file) throws IOException { Pattern.compile(".*public class ([a-zA-Z0-9_]*).*"); final BufferedReader reader = new BufferedReader(new FileReader(file)); for (;;) { - String line = reader.readLine().trim(); + String line = reader.readLine(); if (line == null) break; + line = line.trim(); outerLoop: while (line.startsWith("/*")) { int end = line.indexOf("*/", 2);