diff options
author | mjhalupka <mjhalupka@google.com> | 2018-01-31 14:42:22 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-31 14:43:54 -0800 |
commit | 00d781ae78a8bd51d3c61b621d79f0bb095aff9e (patch) | |
tree | a171b55db66578772ad5c78851daea30488846c9 /src/main/java | |
parent | b9a0baf61732aa9d98522a71a6d98122e7fb76ec (diff) |
Cleaning up a missed reference to getTarget in ConfiguredTargetQueryEnvironment. Follow up to https://github.com/bazelbuild/bazel/commit/426ab9067374bfe5af033e22153507c3f38e7221
PiperOrigin-RevId: 184049987
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java index b48bc1db35..0dfff29072 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.concurrent.MultisetSemaphore; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.packages.DependencyFilter; +import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.FilteringPolicies; @@ -54,6 +55,7 @@ import com.google.devtools.build.lib.query2.output.QueryOptions; import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey; import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue; import com.google.devtools.build.lib.skyframe.GraphBackedRecursivePackageProvider; +import com.google.devtools.build.lib.skyframe.PackageValue; import com.google.devtools.build.lib.skyframe.RecursivePackageProviderBackedTargetPatternResolver; import com.google.devtools.build.lib.skyframe.SkyFunctions; import com.google.devtools.build.lib.skyframe.TargetPatternValue; @@ -432,8 +434,14 @@ public class ConfiguredTargetQueryEnvironment @Override public Target getTarget(Label label) throws TargetNotFoundException, QueryException, InterruptedException { - ConfiguredTarget configuredTarget = getConfiguredTarget(label); - return configuredTarget == null ? null : configuredTarget.getTarget(); + try { + return ((PackageValue) + walkableGraphSupplier.get().getValue(PackageValue.key(label.getPackageIdentifier()))) + .getPackage() + .getTarget(label.getName()); + } catch (NoSuchTargetException e) { + throw new TargetNotFoundException(e); + } } @Override |