Skip to content

Commit 571f6a2

Browse files
fmeumbazel-io
authored andcommitted
Add a missing null check on SkyframeLookupResult#getOrThrow
Speculative fix for bazelbuild#22066 Closes bazelbuild#26101. PiperOrigin-RevId: 765255882 Change-Id: I7569c3b2175d3bca527673f8aa13d1649c86942a
1 parent 9867ebd commit 571f6a2

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/main/java/com/google/devtools/build/lib/skyframe/StarlarkBuildSettingsDetailsFunction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ private static ImmutableMap<PackageIdentifier, PackageValue> getBuildSettingPack
163163
for (PackageIdentifier packageKey : packageKeys) {
164164
try {
165165
SkyValue skyValue = newlyLoaded.getOrThrow(packageKey, NoSuchPackageException.class);
166+
if (skyValue == null) {
167+
return null;
168+
}
166169
buildSettingPackages.put(packageKey, (PackageValue) skyValue);
167170
} catch (NoSuchPackageException e) {
168171
throw new TransitionException(e);

0 commit comments

Comments
 (0)