commit 2bcbecf64d2cc201c102005a80944f224b1a54b2
author shreyax <shreyax@google.com> Wed Sep 26 12:27:32 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Sep 26 12:28:54 2018 -0700
tree 73eff8cf4593ca86b9c9da94387a2ac36858bd8c
parent 18bd7dec9609ff8924d9ebed5f14be523df4eec0

Remove throwing of InterruptedException from LabelVisitor. We never actually have any interruptible methods here.

PiperOrigin-RevId: 214648875

src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
index c299e64..937d19f 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
@@ -224,16 +224,14 @@
       final Multimap<Attribute, Label> labelBuilder,
       Aspect aspect,
       DependencyFilter dependencyFilter) {
-    LabelVisitor<Attribute> labelVisitor = new LabelVisitor<Attribute>() {
-      @Override
-      public void visit(Label label, Attribute aspectAttribute) {
-        Label repositoryRelative = maybeGetRepositoryRelativeLabel(from, label);
-        if (repositoryRelative == null) {
-          return;
-        }
-        labelBuilder.put(aspectAttribute, repositoryRelative);
-      }
-    };
+    LabelVisitor<Attribute> labelVisitor =
+        (label, aspectAttribute) -> {
+          Label repositoryRelative = maybeGetRepositoryRelativeLabel(from, label);
+          if (repositoryRelative == null) {
+            return;
+          }
+          labelBuilder.put(aspectAttribute, repositoryRelative);
+        };
     ImmutableMap<String, Attribute> attributes = aspect.getDefinition().getAttributes();
     for (final Attribute aspectAttribute : attributes.values()) {
       if (!dependencyFilter.apply(aspect, aspectAttribute)) {
@@ -243,13 +241,7 @@
       if (type.getLabelClass() != LabelClass.DEPENDENCY) {
         continue;
       }
-      try {
-        type.visitLabels(labelVisitor, aspectAttribute.getDefaultValue(from), aspectAttribute);
-      } catch (InterruptedException ex) {
-        // Because the LabelVisitor does not throw InterruptedException, it should not be thrown
-        // by visitLabels here.
-        throw new AssertionError(ex);
-      }
+      type.visitLabels(labelVisitor, aspectAttribute.getDefaultValue(from), aspectAttribute);
     }
   }