From 3c0adb26bac6d756fb97e4bcc6d4e5b2cefa5eeb Mon Sep 17 00:00:00 2001 From: Janak Ramakrishnan Date: Mon, 15 Aug 2016 21:54:55 +0000 Subject: Allow Skyframe graph lookups and value retrievals to throw InterruptedException. The only place we now don't handle InterruptedException is in the action graph created after analysis, since I'm not sure that will be around for that much longer. -- MOS_MIGRATED_REVID=130327770 --- .../com/google/devtools/build/lib/rules/java/JavaCommon.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java index a87e5b4ba5..934437c877 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java @@ -51,14 +51,12 @@ import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.PathFragment; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; - import javax.annotation.Nullable; /** @@ -176,8 +174,13 @@ public class JavaCommon { * Creates an action to aggregate all metadata artifacts into a single * <target_name>_instrumented.jar file. */ - public static void createInstrumentedJarAction(RuleContext ruleContext, JavaSemantics semantics, - List metadataArtifacts, Artifact instrumentedJar, String mainClass) { + public static void createInstrumentedJarAction( + RuleContext ruleContext, + JavaSemantics semantics, + List metadataArtifacts, + Artifact instrumentedJar, + String mainClass) + throws InterruptedException { // In Jacoco's setup, metadata artifacts are real jars. new DeployArchiveBuilder(semantics, ruleContext) .setOutputJar(instrumentedJar) -- cgit v1.2.3