commit 07dba941e21619830adcbcae10c5942cf3343f26
author Ulf Adams <ulfjack@google.com> Thu Mar 05 14:47:37 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Thu Mar 05 18:31:47 2015 +0000
tree c0e7b1250bf547b20398a0c3a437864b7b915383
parent a34d5071784ff51f68714b61f4100c35f1e4db3a

Some cleanup changes.

--
MOS_MIGRATED_REVID=87821306

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

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index a84bb94..5bf199d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -420,13 +420,8 @@
         try {
           ConfiguredTarget ct = getConfiguredTarget(label, ctg.getConfiguration());
           keys.add(Preconditions.checkNotNull(ct.getProvider(ConfigMatchingProvider.class)));
-        } catch (NoSuchPackageException e) {
-          // All lookups should succeed because we should not be looking up any targets in error.
-          throw new IllegalStateException(e);
-        } catch (NoSuchTargetException e) {
-          // All lookups should succeed because we should not be looking up any targets in error.
-          throw new IllegalStateException(e);
-        } catch (NoSuchConfiguredTargetException e) {
+        } catch (
+            NoSuchPackageException | NoSuchTargetException | NoSuchConfiguredTargetException e) {
           // All lookups should succeed because we should not be looking up any targets in error.
           throw new IllegalStateException(e);
         }
@@ -781,7 +776,7 @@
     for (ExtraArtifactSet set : builder.build()) {
       boolean filterMatches = filter == null || filter.isIncluded(set.getLabel().toString());
       if (filterMatches) {
-        Iterables.addAll(artifactsToBuild, set.getArtifacts());
+        artifactsToBuild.addAll(set.getArtifacts());
       }
     }
   }