ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-13 14:27:46 +01:00
Code Issues Projects Releases Wiki Activity

Correct aapt/aapt2 waiting too long on execution output (#3071)

Browse Source 
Co-authored-by: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
This commit is contained in:
sv99 2023-05-20 21:01:03 +03:00 committed by GitHub
parent 80dcdd1d34
commit b83b58e8e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
brut.j.util/src/main/java/brut/util/OS.java
View File

@ -120,12 +120,10 @@ public class OS {
StreamCollector collector = new StreamCollector(process.getInputStream()); StreamCollector collector = new StreamCollector(process.getInputStream());
executor.execute(collector); executor.execute(collector);
process.waitFor(); process.waitFor(15, TimeUnit.SECONDS);
if (! executor.awaitTermination(15, TimeUnit.SECONDS)) { executor.shutdownNow();
executor.shutdownNow(); if (! executor.awaitTermination(5, TimeUnit.SECONDS)) {
if (! executor.awaitTermination(5, TimeUnit.SECONDS)) { System.err.println("Stream collector did not terminate.");
System.err.println("Stream collector did not terminate.");
}
} }
return collector.get(); return collector.get();
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {