Simplify AbstractSkyFunctionEnvironment to more directly call getValueOrUntypedExceptions.
PiperOrigin-RevId: 192329649
diff --git a/src/main/java/com/google/devtools/build/skyframe/QueryableGraphBackedSkyFunctionEnvironment.java b/src/main/java/com/google/devtools/build/skyframe/QueryableGraphBackedSkyFunctionEnvironment.java
index dea50d6..3be1c6a 100644
--- a/src/main/java/com/google/devtools/build/skyframe/QueryableGraphBackedSkyFunctionEnvironment.java
+++ b/src/main/java/com/google/devtools/build/skyframe/QueryableGraphBackedSkyFunctionEnvironment.java
@@ -38,12 +38,12 @@
private static ValueOrUntypedException toUntypedValue(NodeEntry nodeEntry)
throws InterruptedException {
if (nodeEntry == null || !nodeEntry.isDone()) {
- return ValueOrExceptionUtils.ofNull();
+ return ValueOrUntypedException.ofNull();
}
SkyValue maybeWrappedValue = nodeEntry.getValueMaybeWithMetadata();
SkyValue justValue = ValueWithMetadata.justValue(maybeWrappedValue);
if (justValue != null) {
- return ValueOrExceptionUtils.ofValueUntyped(justValue);
+ return ValueOrUntypedException.ofValueUntyped(justValue);
}
ErrorInfo errorInfo =
Preconditions.checkNotNull(ValueWithMetadata.getMaybeErrorInfo(maybeWrappedValue));
@@ -51,12 +51,12 @@
if (exception != null) {
// Give SkyFunction#compute a chance to handle this exception.
- return ValueOrExceptionUtils.ofExn(exception);
+ return ValueOrUntypedException.ofExn(exception);
}
// In a cycle.
Preconditions.checkState(
!Iterables.isEmpty(errorInfo.getCycleInfo()), "%s %s", errorInfo, maybeWrappedValue);
- return ValueOrExceptionUtils.ofNull();
+ return ValueOrUntypedException.ofNull();
}
@Override
