Merge branch 'master' into rxsocks

RockyLOMO · Dec 11, 2023 · 9ca4bcf · 9ca4bcf
2 parents 0c92ea9 + c8972da
commit 9ca4bcf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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) {