commit 1724cb27adc695e34ad59623201ecfabc1f45135
author elenairina <elenairina@google.com> Wed Feb 27 02:56:27 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 27 02:58:13 2019 -0800
tree 485c4f50fd9f2cd351ad831b00b8edf99db441e3
parent 711e8b6a702eb65e07031d4aee001d21cc5cc2bb

Fix NPE in JacocoCoverageRunner.

RELNOTES: None.
PiperOrigin-RevId: 235885459

src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverageRunner.java

diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverageRunner.java b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverageRunner.java
index 1bd558e..aa670d7 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverageRunner.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverageRunner.java
@@ -422,10 +422,18 @@
     final File[] metadataFilesFinal = metadataFiles;
     final String javaRunfilesRoot = System.getenv("JACOCO_JAVA_RUNFILES_ROOT");
 
-    final boolean hasOneFile =
-        !isNewImplementation
-            || metadataFile.endsWith("_merged_instr.jar")
-            || metadataFile.endsWith("_deploy.jar");
+    boolean hasOneFile = false;
+    if (!isNewImplementation) {
+      // --noexperimental_java_coverage sets JACOCO_METADATA_JAR to the instrumented jar
+      // and it is only one file.
+      hasOneFile = true;
+    } else if (metadataFile != null
+        && (metadataFile.endsWith("_merged_instr.jar") || metadataFile.endsWith("_deploy.jar"))) {
+      // --experimental_java_coverage can set JACOCO_METADATA_JAR to either one file (a deploy jar
+      // or a merged jar) or to multiple jars.
+      hasOneFile = true;
+    }
+    final boolean hasOneFileFinal = hasOneFile;
 
     final String coverageReportBase = System.getenv("JAVA_COVERAGE_FILE");
 
@@ -489,7 +497,7 @@
                       metadataJars = metadataFilesFinal;
                     } else {
                       metadataJars =
-                          hasOneFile
+                          hasOneFileFinal
                               ? new File[] {new File(metadataFileFinal)}
                               : getFilesFromFileList(new File(metadataFileFinal), javaRunfilesRoot)
                                   .toArray(new File[0]);