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

fix: RejectedExecutionException

Browse Source
This commit is contained in:
huanghongxun
2020-12-26 21:22:04 +08:00
parent dd4683e693
commit 3d33230e25
4 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameVersion.java
View File

@@ -18,7 +18,6 @@
package org.jackhuang.hmcl.game; package org.jackhuang.hmcl.game;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.CompressingUtils; import org.jackhuang.hmcl.util.io.CompressingUtils;
import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.FileUtils;
@@ -114,24 +113,4 @@ public final class GameVersion {
return Optional.empty(); return Optional.empty();
} }
} }
private static final class MinecraftVersion {
public String name;
@SerializedName("release_target")
public String releaseTarget;
public String id;
public boolean stable;
@SerializedName("world_version")
public int worldVersion;
@SerializedName("protocol_version")
public int protocolVersion;
@SerializedName("pack_version")
public int packVersion;
}
} }

12
HMCLCore/src/main/java/org/jackhuang/hmcl/task/FetchTask.java
View File

@@ -38,6 +38,8 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level; import java.util.logging.Level;
import static org.jackhuang.hmcl.util.Lang.threadPool;
public abstract class FetchTask<T> extends Task<T> { public abstract class FetchTask<T> extends Task<T> {
protected final List<URL> urls; protected final List<URL> urls;
protected final int retry; protected final int retry;
@@ -278,15 +280,7 @@ public abstract class FetchTask<T> extends Task<T> {
if (DOWNLOAD_EXECUTOR == null) { if (DOWNLOAD_EXECUTOR == null) {
synchronized (Schedulers.class) { synchronized (Schedulers.class) {
if (DOWNLOAD_EXECUTOR == null) { if (DOWNLOAD_EXECUTOR == null) {
ThreadPoolExecutor executor = new ThreadPoolExecutor(downloadExecutorConcurrency, downloadExecutorConcurrency, 10, TimeUnit.SECONDS, DOWNLOAD_EXECUTOR = threadPool("Download", true, downloadExecutorConcurrency, 10, TimeUnit.SECONDS);
new ArrayBlockingQueue<>(downloadExecutorConcurrency),
runnable -> {
Thread thread = Executors.defaultThreadFactory().newThread(runnable);
thread.setDaemon(true);
return thread;
});
executor.allowCoreThreadTimeOut(true);
DOWNLOAD_EXECUTOR = executor;
} }
} }
} }

10
HMCLCore/src/main/java/org/jackhuang/hmcl/task/Schedulers.java
View File

@@ -23,6 +23,8 @@ import org.jackhuang.hmcl.util.Logging;
import javax.swing.*; import javax.swing.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import static org.jackhuang.hmcl.util.Lang.threadPool;
/** /**
* *
* @author huangyuhui * @author huangyuhui
@@ -47,13 +49,7 @@ public final class Schedulers {
if (IO_EXECUTOR == null) { if (IO_EXECUTOR == null) {
synchronized (Schedulers.class) { synchronized (Schedulers.class) {
if (IO_EXECUTOR == null) { if (IO_EXECUTOR == null) {
IO_EXECUTOR = new ThreadPoolExecutor(0, 4, 10, TimeUnit.SECONDS, IO_EXECUTOR = threadPool("IO", true, 4, 10, TimeUnit.SECONDS);
new LinkedBlockingQueue<>(),
runnable -> {
Thread thread = Executors.defaultThreadFactory().newThread(runnable);
thread.setDaemon(true);
return thread;
});
} }
} }
} }

4
HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java
View File

@@ -202,12 +202,12 @@ public final class Lang {
public static ThreadPoolExecutor threadPool(String name, boolean daemon, int threads, long timeout, TimeUnit timeunit) { public static ThreadPoolExecutor threadPool(String name, boolean daemon, int threads, long timeout, TimeUnit timeunit) {
AtomicInteger counter = new AtomicInteger(1); AtomicInteger counter = new AtomicInteger(1);
ThreadPoolExecutor pool = new ThreadPoolExecutor(0, threads, timeout, timeunit, new LinkedBlockingQueue<>(), r -> { ThreadPoolExecutor pool = new ThreadPoolExecutor(threads, threads, timeout, timeunit, new LinkedBlockingQueue<>(), r -> {
Thread t = new Thread(r, name + "-" + counter.getAndIncrement()); Thread t = new Thread(r, name + "-" + counter.getAndIncrement());
t.setDaemon(daemon); t.setDaemon(daemon);
return t; return t;
}); });
pool.allowsCoreThreadTimeOut(); pool.allowCoreThreadTimeOut(true);
return pool; return pool;
} }