commit de07246c377da730aff964cfb4366ec834c93fdd
author juliexxia <juliexxia@google.com> Thu Jan 07 07:53:28 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Jan 07 07:54:32 2021 -0800
tree d671894c07290df140e85c8c1392bbf2273347de
parent 3b2d3100e4f70c3cfdd79ac074a26f660e24d969

fix crash for recursive target pattern outside of universe scope

PiperOrigin-RevId: 350560818

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java
index 72b343a..f89e4db 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePackageProviderBackedTargetPatternResolver.java
@@ -44,6 +44,7 @@
 import com.google.devtools.build.lib.pkgcache.FilteringPolicy;
 import com.google.devtools.build.lib.pkgcache.RecursivePackageProvider;
 import com.google.devtools.build.lib.pkgcache.TargetPatternResolverUtil;
+import com.google.devtools.build.lib.query2.engine.QueryException;
 import com.google.devtools.build.lib.server.FailureDetails.TargetPatterns;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.ArrayList;
@@ -253,7 +254,7 @@
           pathFragment,
           blacklistedSubdirectories,
           excludedSubdirectories);
-    } catch (TargetParsingException e) {
+    } catch (TargetParsingException | QueryException e) {
       return Futures.immediateFailedFuture(e);
     } catch (InterruptedException e) {
       return Futures.immediateCancelledFuture();