[JENKINS-43341] Protect code against NullPointerException and throw I…

…llegalStateException in case of uncertain code path
jenkinsci · Apr 8, 2017 · b128845 · b128845
1 parent c03c606
commit b128845
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/MavenSpyLogProcessor.java b/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/MavenSpyLogProcessor.java
@@ -58,16 +58,6 @@ public class MavenSpyLogProcessor implements Serializable {
 
     private static final Logger LOGGER = Logger.getLogger(MavenSpyLogProcessor.class.getName());
 
-    protected final transient DocumentBuilder documentBuilder;
-
-    public MavenSpyLogProcessor() {
-        try {
-            documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        } catch (ParserConfigurationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
     public void processMavenSpyLogs(StepContext context, FilePath mavenSpyLogFolder) throws IOException, InterruptedException {
         FilePath[] mavenSpyLogsList = mavenSpyLogFolder.list("maven-spy-*.log");
         LOGGER.log(Level.FINE, "Found {0} maven execution reports in {1}", new Object[]{mavenSpyLogsList.length, mavenSpyLogFolder});
@@ -79,10 +69,20 @@ public void processMavenSpyLogs(StepContext context, FilePath mavenSpyLogFolder)
         }
         FilePath workspace = context.get(FilePath.class); // TODO check that it's the good workspace
 
+        DocumentBuilder documentBuilder;
+        try {
+            documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        } catch (ParserConfigurationException e) {
+            throw new IllegalStateException("Failure to create a DocumentBuilder", e);
+        }
+
         for (FilePath mavenSpyLogs : mavenSpyLogsList) {
             try {
                 LOGGER.log(Level.INFO, "Evaluate Maven Spy logs: " + mavenSpyLogs.getRemote());
                 InputStream mavenSpyLogsInputStream = mavenSpyLogs.read();
+                if (mavenSpyLogsInputStream == null) {
+                    throw new IllegalStateException("InputStream for " + mavenSpyLogs.getRemote() + " is null");
+                }
 
                 Element mavenSpyLogsElt = documentBuilder.parse(mavenSpyLogsInputStream).getDocumentElement();