summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2015-04-29 14:45:41 +0200
committerJean-Marie Henaff <jmhenaff@google.com>2015-04-29 14:45:41 +0200
commit6d274f0b93113aa18ad146545847e7e1d9795dff (patch)
treec050ed0bbc9b9444fd569313faf4c79878d846d4
parent7300b595c30a57ca4bd15439bcc29e78810f751b (diff)
downloadtoolchain_jack-6d274f0b93113aa18ad146545847e7e1d9795dff.zip
toolchain_jack-6d274f0b93113aa18ad146545847e7e1d9795dff.tar.gz
toolchain_jack-6d274f0b93113aa18ad146545847e7e1d9795dff.tar.bz2
Set fifo opening timeout to 30s in Jack server
It used to be 10s. Bug: 20679392 Change-Id: If68c8dd029f736295bdb1266e5c2c6df994597ee
-rw-r--r--jack-server/src/com/android/jack/server/JackSimpleServer.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/jack-server/src/com/android/jack/server/JackSimpleServer.java b/jack-server/src/com/android/jack/server/JackSimpleServer.java
index 3179d52..40125cd 100644
--- a/jack-server/src/com/android/jack/server/JackSimpleServer.java
+++ b/jack-server/src/com/android/jack/server/JackSimpleServer.java
@@ -157,6 +157,9 @@ public class JackSimpleServer {
private static final int CLI_IDX_TIEMOUT = 4;
private static final int CLI_IDX_END = 5;
+ @Nonnegative
+ private static final int FIFO_TIMEOUT = 30000;
+
@CheckForNull
private static Connection serviceConnection;
@CheckForNull
@@ -382,7 +385,7 @@ public class JackSimpleServer {
try {
logger.log(Level.INFO, "Open standard output '" + command[CMD_IDX_OUT] + "'");
try {
- out = new FifoStreamFile(command[CMD_IDX_OUT]).getPrintStream(10000);
+ out = new FifoStreamFile(command[CMD_IDX_OUT]).getPrintStream(FIFO_TIMEOUT);
} catch (IOException | TimeoutException e) {
logger.log(Level.SEVERE, e.getMessage());
response.setStatus(Status.BAD_REQUEST);
@@ -391,7 +394,7 @@ public class JackSimpleServer {
logger.log(Level.INFO, "Open standard error '" + command[CMD_IDX_ERR] + "'");
try {
- err = new FifoStreamFile(command[CMD_IDX_ERR]).getPrintStream(10000);
+ err = new FifoStreamFile(command[CMD_IDX_ERR]).getPrintStream(FIFO_TIMEOUT);
} catch (IOException | TimeoutException e) {
logger.log(Level.SEVERE, e.getMessage());
response.setStatus(Status.BAD_REQUEST);