Fix ExecRootUtil.getExecutionRoot always falling through.
ExecRootUtil.getExecutionRoot gets the execroot but doesn't actually
return it.  This CL fixes that.
@@ -55,7 +55,9 @@ public final class ExecRootUtil {
BlazeContext context)
throws GetArtifactsException {
String executionRoot = buildResultHelper.getBuildOutput().getLocalExecRoot();
- if (executionRoot == null && !useBlazeInfoAsExecrootFallback.getValue()) {
+ if (executionRoot != null) {
+ return executionRoot;
+ } else if (!useBlazeInfoAsExecrootFallback.getValue()) {
return null;
}
