commit fc567b333e4bb6d2f5f64024c4adba1f446da3b4
author Marian Lobur <loburm@google.com> Mon Sep 14 08:44:25 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Mon Sep 14 15:39:33 2015 +0000
tree 7bcc1b83883e454a632d8383d28624d78d43d264
parent c9e52201d11765638101e570664b09eaf1357cbd

Fix a bug, when we have dependency from one aspect to another aspect1->aspect2 and aspect2 fails then aspect1 throws IllegalStateException.

--
MOS_MIGRATED_REVID=102976139

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index a4d54c0..87523c1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -129,6 +129,8 @@
           transitivePackages);
     } catch (DependencyEvaluationException e) {
       throw new AspectFunctionException(e.getRootCauseSkyKey(), e.getCause());
+    } catch (AspectCreationException e) {
+      throw new AspectFunctionException(e);
     }
   }