lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Relax timeout restrictions

Browse Source
This commit is contained in:
Glavo
2021-10-14 05:05:31 +08:00
committed by Yuhui Huang
parent 74fd35047c
commit d68e988c15
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/Architecture.java
View File

@@ -195,7 +195,7 @@ public enum Architecture {
} else { } else {
try { try {
Process process = Runtime.getRuntime().exec("/usr/bin/arch"); Process process = Runtime.getRuntime().exec("/usr/bin/arch");
if (process.waitFor(1, TimeUnit.SECONDS)) { if (process.waitFor(3, TimeUnit.SECONDS)) {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
sysArchName = reader.readLine().trim(); sysArchName = reader.readLine().trim();
} catch (Exception e) { } catch (Exception e) {

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java
View File

@@ -288,7 +288,7 @@ public final class JavaVersion {
try { try {
LOG.log(Level.FINER, "Looking for Java:" + executable); LOG.log(Level.FINER, "Looking for Java:" + executable);
Future<JavaVersion> future = Schedulers.io().submit(() -> fromExecutable(executable)); Future<JavaVersion> future = Schedulers.io().submit(() -> fromExecutable(executable));
JavaVersion javaVersion = future.get(3, TimeUnit.SECONDS); JavaVersion javaVersion = future.get(5, TimeUnit.SECONDS);
LOG.log(Level.FINE, "Found Java (" + javaVersion.getVersion() + ") " + javaVersion.getBinary().toString()); LOG.log(Level.FINE, "Found Java (" + javaVersion.getVersion() + ") " + javaVersion.getBinary().toString());
return Stream.of(javaVersion); return Stream.of(javaVersion);
} catch (ExecutionException | InterruptedException | TimeoutException e) { } catch (ExecutionException | InterruptedException | TimeoutException e) {