[JENKINS-47508] Fix NPE when executionId is missing (#105)

jenkinsci · Oct 23, 2017 · 0ecfd86 · 0ecfd86
1 parent 291aa5b
commit 0ecfd86
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.../java/org/jenkinsci/plugins/pipeline/maven/eventspy/handler/AbstractExecutionHandler.java b/.../java/org/jenkinsci/plugins/pipeline/maven/eventspy/handler/AbstractExecutionHandler.java
@@ -96,7 +96,10 @@ public boolean _handle(@Nonnull ExecutionEvent executionEvent) {
             plugin.setAttribute("artifactId", execution.getArtifactId());
             plugin.setAttribute("goal", execution.getGoal());
             plugin.setAttribute("version", execution.getVersion());
-            plugin.setAttribute("executionId", execution.getExecutionId());
+            if (execution.getExecutionId() != null) {
+                // See JENKINS-47508, caused by plugin being declared and invoked by the <reports> section
+                plugin.setAttribute("executionId", execution.getExecutionId());
+            }
             if (execution.getLifecyclePhase() != null) {
                 // protect against null lifecyclePhase. cause is NOT clear
                 plugin.setAttribute("lifecyclePhase", execution.getLifecyclePhase());