up

RockyLOMO · Dec 5, 2024 · d59065a · d59065a
1 parent 608fb55
commit d59065a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/rxlib-x/pom.xml b/rxlib-x/pom.xml
@@ -19,7 +19,7 @@
         <mysql.version>5.1.49</mysql.version>
         <HikariCP.version>4.0.3</HikariCP.version>
         <druid.version>1.2.21</druid.version>
-        <redisson.version>3.33.0</redisson.version>
+        <redisson.version>3.38.1</redisson.version>
         <guava.version>32.1.1-jre</guava.version>
 
         <javaxMail.version>1.6.2</javaxMail.version>

diff --git a/rxlib/pom.xml b/rxlib/pom.xml
@@ -23,7 +23,7 @@
         <byte-buddy.version>1.15.7</byte-buddy.version>
         <zip4j.version>2.11.3</zip4j.version>
         <h2.version>2.2.224</h2.version>
-        <netty.version>4.1.111.Final</netty.version>
+        <netty.version>4.1.114.Final</netty.version>
         <!--1.78.1有问题-->
         <bcprov.version>1.78</bcprov.version>
         <okhttp.version>4.12.0</okhttp.version>

diff --git a/rxlib/src/main/java/org/rx/core/ObjectPool.java b/rxlib/src/main/java/org/rx/core/ObjectPool.java
@@ -52,8 +52,8 @@ public synchronized boolean isLeaked(long threshold) {
     final PredicateFunc<T> validateHandler;
     final BiAction<T> passivateHandler;
     final ConcurrentLinkedDeque<IdentityWrapper<T>> stack = new ConcurrentLinkedDeque<>();
-    final ConcurrentHashMap<IdentityWrapper<T>, ObjectConf> conf = new ConcurrentHashMap<>();
-    //    final HashMap<IdentityWrapper<T>, ObjectConf> conf = new HashMap<>();
+    //    final ConcurrentHashMap<IdentityWrapper<T>, ObjectConf> conf = new ConcurrentHashMap<>();
+    final HashMap<IdentityWrapper<T>, ObjectConf> conf = new HashMap<>();
     final AtomicInteger size = new AtomicInteger();
     @Getter
     final int minSize;

diff --git a/rxlib/src/main/java/org/rx/net/http/HttpClient.java b/rxlib/src/main/java/org/rx/net/http/HttpClient.java
@@ -331,7 +331,7 @@ public static Map<String, String> decodeQueryString(String url) {
     }
 
     public static Map<String, String> decodeHeader(String raw) {
-        return decodeHeader(Arrays.toList(raw.split(Pattern.quote("\n"))));
+        return decodeHeader(Arrays.toList(raw.trim().split(Pattern.quote("\n"))));
     }
 
     @SneakyThrows
@@ -342,7 +342,7 @@ public static Map<String, String> decodeHeader(List<String> pairs) {
         }
 
         for (String pair : pairs) {
-            int idx = pair.indexOf(Pattern.quote(":"));
+            int idx = pair.indexOf(":");
             String key = idx > 0 ? URLDecoder.decode(pair.substring(0, idx), StandardCharsets.UTF_8.name()) : pair;
             String value = idx > 0 && pair.length() > idx + 1 ? URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8.name()).trim() : Strings.EMPTY;
             map.put(key, value);