diff options
author | 2017-03-29 20:12:19 +0000 | |
---|---|---|
committer | 2017-03-31 17:06:27 +0200 | |
commit | 274cb26c2b1198aa1da4871022f8e3ddf14b4e84 (patch) | |
tree | 77712673829b1232b8b4fd1c64ef27c2a82d0724 /src/main/java/com/google/devtools/build/lib | |
parent | 115ea10fe907b80ea11ad7db6f50657ecc2c18cb (diff) |
BuildView#getConfiguredTargetForTesting respects null transitions.
RuleTransitionFactory#buildTransitionFor is @Nullable, but the
SkyframeExecutor expects a non-null Transition. If the factory
returns null, the SkyframeExecutor should be passed NONE, not null.
PiperOrigin-RevId: 151615724
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/BuildView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index 2524deb5bc..c9709ab4ef 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -1101,7 +1101,11 @@ public class BuildView { RuleTransitionFactory factory = rule .getRuleClassObject() .getTransitionFactory(); - return (factory == null) ? ConfigurationTransition.NONE : factory.buildTransitionFor(rule); + if (factory == null) { + return ConfigurationTransition.NONE; + } + Transition transition = factory.buildTransitionFor(rule); + return (transition == null) ? ConfigurationTransition.NONE : transition; } /** |