apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-16 16:23:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make sure the IpClient does not block forever when something wrong happens

Browse Source
This commit is contained in:
Guillaume Nodet
2021-05-20 14:23:27 +02:00
parent 1c202e80d1
commit 808d62d161
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sync/src/main/java/org/mvndaemon/mvnd/sync/IpcClient.java
View File

@@ -39,7 +39,8 @@ import java.util.Random;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -144,18 +145,28 @@ public class IpcClient {
.redirectError(discard)
.start();
Future<int[]> future = ForkJoinPool.commonPool().submit(() -> {
ExecutorService es = Executors.newSingleThreadExecutor();
Future<int[]> future = es.submit(() -> {
Socket s = ss.accept();
DataInputStream dis = new DataInputStream(s.getInputStream());
int rand2 = dis.readInt();
int port2 = dis.readInt();
return new int[] { rand2, port2 };
});
int[] res = future.get(5, TimeUnit.SECONDS);
int[] res;
try {
res = future.get(5, TimeUnit.SECONDS);
} catch (Exception e) {
process.destroyForcibly();
throw e;
} finally {
es.shutdownNow();
ss.close();
}
if (rand != res[0]) {
process.destroyForcibly();
throw new IllegalStateException("IpcServer did not respond with the correct random");
}
ss.close();
int port = res[1];
Socket socket = new Socket();