Fix Java fallback compiles in combination with specific spawn strategies.
RELNOTES: None.
@@ -48,7 +48,6 @@ import com.google.devtools.build.lib.actions.ParameterFile;
import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.RunfilesSupplier;
import com.google.devtools.build.lib.actions.Spawn;
-import com.google.devtools.build.lib.actions.SpawnActionContext;
import com.google.devtools.build.lib.actions.SpawnContinuation;
import com.google.devtools.build.lib.actions.SpawnResult;
import com.google.devtools.build.lib.actions.extra.ExtraActionInfo;
@@ -543,12 +542,10 @@ public class JavaCompileAction extends AbstractAction
} catch (CommandLineExpansionException e) {
throw new ActionExecutionException(e, JavaCompileAction.this, /*catastrophe=*/ false);
}
- SpawnContinuation spawnContinuation =
- actionExecutionContext
- .getContext(SpawnActionContext.class)
- .beginExecution(spawn, actionExecutionContext);
return new JavaFallbackActionContinuation(
- actionExecutionContext, results, spawnContinuation);
+ actionExecutionContext,
+ results,
+ SpawnContinuation.ofBeginExecution(spawn, actionExecutionContext));
} catch (IOException e) {
throw printIOExceptionAndConvertToActionExecutionException(actionExecutionContext, e);
} catch (ExecException e) {
