commit 2f746b3df971de42ea1222f4bb6851f8fd5e1e11
author Michael Staib <mstaib@google.com> Mon Oct 05 18:07:47 2015 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Tue Oct 06 07:03:38 2015 +0000
tree af4b3eeb29fe2701d4e9d53929b3906685ed0005
parent bf01d8424cae8a1c141106c26fab44a2c3c6f85b

Remove extraneous check in DependencyResolver.

At this point in the method we already know that aspect != null,
because we're in the else-branch of an if (aspect == null).

--
MOS_MIGRATED_REVID=104674784

src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
index d0aff0f7..63e9012 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
@@ -260,9 +260,7 @@
     } else {
       attributes = new ArrayList<>();
       attributes.addAll(rule.getRuleClassObject().getAttributes());
-      if (aspect != null) {
-        attributes.addAll(aspect.getAttributes().values());
-      }
+      attributes.addAll(aspect.getAttributes().values());
     }
 
     ImmutableSortedKeyListMultimap.Builder<Attribute, LabelAndConfiguration> result =