commit 169da6d109a55da5c2fcf2c7ad7c71fa4b40e88d
author mjhalupka <mjhalupka@google.com> Mon Mar 25 13:07:52 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 25 13:09:49 2019 -0700
tree 3095ed4e0fc5db6fb89d4f0b344c98f79f82096b
parent 256a78c1e945206b21e3c2e80a4c3967751be4ce

Missed a reference to getChildren() in NestedSet to propagate
InterruptedExceptions.

PiperOrigin-RevId: 240202025

src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java

diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
index 11d3faf..7558519 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
@@ -419,7 +419,7 @@
     if (memo == LEAF_MEMO) {
       return ImmutableList.copyOf(new ArraySharingCollection<>((Object[]) children));
     }
-    CompactHashSet<E> members = lockedExpand();
+    CompactHashSet<E> members = lockedExpand(handleInterruptedException);
     if (members != null) {
       return ImmutableList.copyOf(members);
     }
@@ -457,11 +457,12 @@
    * If this is the first call for this object, fills {@code this.memo} and returns a set from
    * {@link #walk}. Otherwise returns null; the caller should use {@link #replay} instead.
    */
-  private synchronized CompactHashSet<E> lockedExpand() {
+  private synchronized CompactHashSet<E> lockedExpand(boolean handleInterruptedException)
+      throws InterruptedException {
     if (memo != null) {
       return null;
     }
-    Object[] children = (Object[]) this.getChildren();
+    Object[] children = (Object[]) this.getChildren(handleInterruptedException);
     CompactHashSet<E> members = CompactHashSet.createWithExpectedSize(128);
     CompactHashSet<Object> sets = CompactHashSet.createWithExpectedSize(128);
     sets.add(children);