From b83b58e8e8cf0b880caf5a3dafafad63c534ac4d Mon Sep 17 00:00:00 2001
From: sv99 <sv99@inbox.ru>
Date: Sat, 20 May 2023 21:01:03 +0300
Subject: [PATCH] Correct aapt/aapt2 waiting too long on execution output
 (#3071)

Co-authored-by: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
---
 brut.j.util/src/main/java/brut/util/OS.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/brut.j.util/src/main/java/brut/util/OS.java b/brut.j.util/src/main/java/brut/util/OS.java
index cc1cb7d8..58f3c531 100644
--- a/brut.j.util/src/main/java/brut/util/OS.java
+++ b/brut.j.util/src/main/java/brut/util/OS.java
@@ -120,12 +120,10 @@ public class OS {
             StreamCollector collector = new StreamCollector(process.getInputStream());
             executor.execute(collector);
 
-            process.waitFor();
-            if (! executor.awaitTermination(15, TimeUnit.SECONDS)) {
-                executor.shutdownNow();
-                if (! executor.awaitTermination(5, TimeUnit.SECONDS)) {
-                    System.err.println("Stream collector did not terminate.");
-                }
+            process.waitFor(15, TimeUnit.SECONDS);
+            executor.shutdownNow();
+            if (! executor.awaitTermination(5, TimeUnit.SECONDS)) {
+                System.err.println("Stream collector did not terminate.");
             }
             return collector.get();
         } catch (IOException | InterruptedException e) {