From c8972da6d5c616dfd1678b41c7d2defd69998bbb Mon Sep 17 00:00:00 2001 From: wxm <115806199+youfanx@users.noreply.github.com> Date: Mon, 11 Dec 2023 17:07:47 +0800 Subject: [PATCH] up --- rxlib/src/main/java/org/rx/core/RxConfig.java | 2 +- rxlib/src/main/java/org/rx/core/Sys.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rxlib/src/main/java/org/rx/core/RxConfig.java b/rxlib/src/main/java/org/rx/core/RxConfig.java index 18b228c7..a535fcad 100644 --- a/rxlib/src/main/java/org/rx/core/RxConfig.java +++ b/rxlib/src/main/java/org/rx/core/RxConfig.java @@ -251,7 +251,7 @@ public void refreshFromSystemProperty() { net.connectTimeoutMillis = SystemPropertyUtil.getInt(ConfigNames.NET_CONNECT_TIMEOUT_MILLIS, net.connectTimeoutMillis); net.poolMaxSize = SystemPropertyUtil.getInt(ConfigNames.NET_POOL_MAX_SIZE, net.poolMaxSize); if (net.poolMaxSize <= 0) { - net.poolMaxSize = Constants.CPU_THREADS * 2; + net.poolMaxSize = Math.max(10, Constants.CPU_THREADS * 2); } net.poolKeepAliveSeconds = SystemPropertyUtil.getInt(ConfigNames.NET_POOL_KEEP_ALIVE_SECONDS, net.poolKeepAliveSeconds); net.userAgent = SystemPropertyUtil.get(ConfigNames.NET_USER_AGENT, net.userAgent); diff --git a/rxlib/src/main/java/org/rx/core/Sys.java b/rxlib/src/main/java/org/rx/core/Sys.java index 28cd5277..624537c8 100644 --- a/rxlib/src/main/java/org/rx/core/Sys.java +++ b/rxlib/src/main/java/org/rx/core/Sys.java @@ -562,6 +562,12 @@ static Object visitJson(Object cur, String path, AtomicInteger i, char c, String } else if (cur instanceof Iterable) { //ignore } else { + if (cur == null) { + if (throwOnEmptyChild) { + throw new InvalidException("Get empty child by path {}", visitor); + } + return null; + } try { cur = Reflects.readField(cur, visitor); } catch (Throwable e) {