Fix databinding after https://github.com/bazelbuild/bazel/commit/9b29a1bd7bbe37500b28a6508cb82ca1943c75b5

PiperOrigin-RevId: 206182289

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfoProvider.java
index 0d125f9a6e..a82496fd18 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfoProvider.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.rules.java;
 
 import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -81,6 +82,10 @@ public abstract class JavaPluginInfoProvider implements TransitiveInfoProvider {
     }
   }
 
+  public static JavaPluginInfoProvider merge(JavaPluginInfoProvider a, JavaPluginInfoProvider b) {
+    return a.isEmpty() ? b : b.isEmpty() ? a : merge(ImmutableList.of(a, b));
+  }
+
   public static JavaPluginInfoProvider merge(Iterable<JavaPluginInfoProvider> providers) {
     List<JavaPluginInfo> plugins = new ArrayList<>();
     List<JavaPluginInfo> apiGeneratingPlugins = new ArrayList<>();