diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/Spawns.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Spawns.java b/src/main/java/com/google/devtools/build/lib/actions/Spawns.java index d4827be875..e1156e9745 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/Spawns.java +++ b/src/main/java/com/google/devtools/build/lib/actions/Spawns.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.actions; import com.google.devtools.build.lib.util.CommandDescriptionForm; import com.google.devtools.build.lib.util.CommandFailureUtils; import com.google.devtools.build.lib.vfs.Path; +import java.time.Duration; import java.util.Collection; import java.util.Map; @@ -34,13 +35,13 @@ public final class Spawns { /** * Parse the timeout key in the spawn execution info, if it exists. Otherwise, return -1. */ - public static int getTimeoutSeconds(Spawn spawn) throws ExecException { + public static Duration getTimeout(Spawn spawn) throws ExecException { String timeoutStr = spawn.getExecutionInfo().get("timeout"); if (timeoutStr == null) { - return -1; + return Duration.ZERO; } try { - return Integer.parseInt(timeoutStr); + return Duration.ofSeconds(Integer.parseInt(timeoutStr)); } catch (NumberFormatException e) { throw new UserExecException("could not parse timeout: ", e); } |