commit b7959276d1b39d1e12fd34b273d7703d2d4159c9
author cushon <cushon@google.com> Wed Nov 18 12:47:36 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 18 12:48:42 2020 -0800
tree 8e0e152b7cd11a363c2446cd0432e6d5e90c5aa6
parent 855cc5d72f328ea5db619e84d95e76c5d712a329

Fix an NPE in `JavaConfiguration`

when Java runtime and toolchain flags are set to `null` by a transition
function.

PiperOrigin-RevId: 343136357

src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
index 2972d67..d668e35 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
@@ -36,6 +36,7 @@
 import com.google.devtools.build.lib.starlarkbuildapi.java.JavaConfigurationApi;
 import com.google.devtools.common.options.TriState;
 import java.util.Map;
+import java.util.Objects;
 import javax.annotation.Nullable;
 
 /** A java compiler configuration containing the flags required for compilation. */
@@ -191,31 +192,23 @@
         javaOptions.experimentalTurbineAnnotationProcessing;
 
     if (javaOptions.disallowLegacyJavaToolchainFlags) {
-      if (!javaOptions.javaBase.equals(javaOptions.defaultJavaBase())) {
-        throw new InvalidConfigurationException(
-            String.format(
-                "--javabase=%s is no longer supported, use --platforms instead (see #7849)",
-                javaOptions.javaBase));
-      }
-      if (!javaOptions.getHostJavaBase().equals(javaOptions.defaultHostJavaBase())) {
-        throw new InvalidConfigurationException(
-            String.format(
-                "--host_javabase=%s is no longer supported, use --platforms instead (see #7849)",
-                javaOptions.getHostJavaBase()));
-      }
-      if (!javaOptions.javaToolchain.equals(javaOptions.defaultJavaToolchain())) {
-        throw new InvalidConfigurationException(
-            String.format(
-                "--java_toolchain=%s is no longer supported, use --platforms instead (see #7849)",
-                javaOptions.javaToolchain));
-      }
-      if (!javaOptions.hostJavaToolchain.equals(javaOptions.defaultJavaToolchain())) {
-        throw new InvalidConfigurationException(
-            String.format(
-                "--host_java_toolchain=%s is no longer supported, use --platforms instead (see"
-                    + " #7849)",
-                javaOptions.hostJavaToolchain));
-      }
+      checkLegacyToolchainFlagIsUnset(
+          "javabase", javaOptions.javaBase, javaOptions.defaultJavaBase());
+      checkLegacyToolchainFlagIsUnset(
+          "host_javabase", javaOptions.getHostJavaBase(), javaOptions.defaultHostJavaBase());
+      checkLegacyToolchainFlagIsUnset(
+          "java_toolchain", javaOptions.javaToolchain, javaOptions.defaultJavaToolchain());
+      checkLegacyToolchainFlagIsUnset(
+          "host_java_toolchain", javaOptions.hostJavaToolchain, javaOptions.defaultJavaToolchain());
+    }
+  }
+
+  private static void checkLegacyToolchainFlagIsUnset(String flag, Label label, Label defaultValue)
+      throws InvalidConfigurationException {
+    if (!Objects.equals(label, defaultValue)) {
+      throw new InvalidConfigurationException(
+          String.format(
+              "--%s=%s is no longer supported, use --platforms instead (see #7849)", flag, label));
     }
   }