Simplify execution group handling in JavaHeaderCompileAction

PiperOrigin-RevId: 671335363
Change-Id: Ife283c15fe67cae860701f38d31fa9f90bd2eb6e

Author: hvadehra

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

@@ -514,10 +514,11 @@ public void build(JavaToolchainProvider javaToolchain)
           TargetUtils.getExecutionInfo(
               ruleContext.getRule(), ruleContext.isAllowTagsPropagation()));
 
-      ActionOwner actionOwner = null;
-      if (ruleContext.useAutoExecGroups()) {
-        actionOwner = ruleContext.getActionOwner(execGroup);
-      }
+      ActionOwner actionOwner =
+          ruleContext.useAutoExecGroups()
+              ? ruleContext.getActionOwner(execGroup)
+              : ruleContext.getActionOwner();
+
       if (useDirectClasspath) {
         NestedSet<Artifact> classpath;
         NestedSet<Artifact> additionalArtifactsForPathMapping;
@@ -545,7 +546,7 @@ public void build(JavaToolchainProvider javaToolchain)
 
         ruleContext.registerAction(
             new JavaHeaderCompileAction(
-                /* owner= */ actionOwner == null ? ruleContext.getActionOwner() : actionOwner,
+                /* owner= */ actionOwner,
                 /* tools= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER),
                 /* inputs= */ allInputs,
                 /* outputs= */ outputs.build(),
@@ -601,7 +602,7 @@ public void build(JavaToolchainProvider javaToolchain)
       ruleContext.registerAction(
           new JavaCompileAction(
               /* compilationType= */ JavaCompileAction.CompilationType.TURBINE,
-              /* owner= */ actionOwner == null ? ruleContext.getActionOwner() : actionOwner,
+              /* owner= */ actionOwner,
               /* tools= */ toolsJars,
               /* progressMessage= */ progressMessage,
               /* mandatoryInputs= */ mandatoryInputs,