Skip to content

Commit a636bc3

Browse files
committed
Fix reading probe information if process exits before we attempt a read.
1 parent 23f20ba commit a636bc3

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

src/main/java/net/minecraftforge/java_provisioner/JavaDirectoryLocator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import net.minecraftforge.java_provisioner.Disco.Arch;
1313
import net.minecraftforge.java_provisioner.api.IJavaInstall;
1414
import net.minecraftforge.java_provisioner.util.OS;
15-
import net.minecraftforge.java_provisioner.util.ProcessUtils;
1615

1716
/*
1817
* Attempts to find the java install from specific folders.

src/main/java/net/minecraftforge/java_provisioner/util/ProcessUtils.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,16 @@ public static int runCommand(List<String> lines, String... args) {
109109

110110
BufferedReader is = new BufferedReader(new InputStreamReader(process.getInputStream()));
111111

112-
while (process.isAlive()) {
113-
try {
114-
while (is.ready()) {
115-
String line = is.readLine();
116-
if (line != null)
117-
lines.add(line);
118-
}
119-
} catch (IOException e) {
120-
getStackTrace(e, lines);
121-
process.destroy();
122-
return -2;
112+
try {
113+
while (process.isAlive() || is.ready()) {
114+
String line = is.readLine();
115+
if (line != null)
116+
lines.add(line);
123117
}
118+
} catch (IOException e) {
119+
getStackTrace(e, lines);
120+
process.destroy();
121+
return -2;
124122
}
125123

126124
return process.exitValue();

0 commit comments

Comments
 (0)