Fix NPE when coveragerunner is not set on the toolchain.

Fixes bazelbuild#12619 Closes bazelbuild#12625. PiperOrigin-RevId: 345638551
Bencodes · Dec 4, 2020 · d90ec67 · d90ec67
1 parent d1f6b01
commit d90ec67
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
@@ -378,6 +378,7 @@ public void addCoverageSupport() {
     if (jacocoRunner == null) {
       ruleContext.ruleError(
           "jacocorunner not set in java_toolchain:" + javaToolchain.getToolchainLabel());
+      return;
     }
     Artifact jacocoRunnerJar = jacocoRunner.getExecutable();
     if (isStrict()) {

diff --git a/src/test/shell/bazel/bazel_java_test_defaults.sh b/src/test/shell/bazel/bazel_java_test_defaults.sh
@@ -122,4 +122,38 @@ EOF
   expect_log "major version: 55"
 }
 
+function test_tools_jdk_toolchain_nojacocorunner() {
+  mkdir -p java/main
+  cat >java/main/BUILD <<EOF
+java_binary(
+    name = 'JavaBinary',
+    srcs = ['JavaBinary.java'],
+    main_class = 'JavaBinary',
+)
+load(
+    "@bazel_tools//tools/jdk:default_java_toolchain.bzl",
+    "default_java_toolchain",
+)
+default_java_toolchain(
+  name = "default_toolchain",
+  jacocorunner = None,
+  visibility = ["//visibility:public"],
+)
+EOF
+
+   cat >java/main/JavaBinary.java <<EOF
+public class JavaBinary {
+   public static void main(String[] args) {
+    System.out.println("Successfully executed JavaBinary!");
+  }
+}
+EOF
+  bazel coverage java/main:JavaBinary \
+      --java_toolchain=//java/main:default_toolchain \
+      --javabase=@bazel_tools//tools/jdk:remote_jdk11 \
+      --verbose_failures -s &>"${TEST_log}" \
+      && fail "Coverage succeeded even when jacocorunner not set"
+  expect_log "jacocorunner not set in java_toolchain:"
+}
+
 run_suite "Java integration tests with default Bazel values"