Merge branch '3.2' into 0620-threadpool

AlbumenJ · Jun 23, 2024 · 679e989 · 679e989
2 parents 31eb8fd + 99601a6
commit 679e989
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 26 deletions.
diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 8
+          java-version: 21
       - uses: actions/cache@v3
         name: "Cache local Maven repository"
         with:

diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@ -37,7 +37,7 @@
     <skip_maven_deploy>true</skip_maven_deploy>
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring-boot-maven-plugin.version>2.7.18</spring-boot-maven-plugin.version>
-    <micrometer-core.version>1.13.0</micrometer-core.version>
+    <micrometer-core.version>1.13.1</micrometer-core.version>
   </properties>
   <dependencyManagement>
     <dependencies>

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -90,12 +90,12 @@
   <properties>
     <!-- Common libs -->
     <!-- <spring_version>4.3.30.RELEASE</spring_version> -->
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
     <spring_security_version>5.8.12</spring_security_version>
     <javassist_version>3.30.2-GA</javassist_version>
     <bytebuddy.version>1.14.17</bytebuddy.version>
     <netty_version>3.2.10.Final</netty_version>
-    <netty4_version>4.1.110.Final</netty4_version>
+    <netty4_version>4.1.111.Final</netty4_version>
     <httpclient_version>4.5.14</httpclient_version>
     <httpcore_version>4.4.16</httpcore_version>
     <fastjson_version>1.2.83</fastjson_version>
@@ -119,13 +119,13 @@
     <snakeyaml_version>2.2</snakeyaml_version>
     <commons_lang3_version>3.14.0</commons_lang3_version>
     <envoy_api_version>0.1.35</envoy_api_version>
-    <micrometer.version>1.13.0</micrometer.version>
+    <micrometer.version>1.13.1</micrometer.version>
 
-    <micrometer-tracing.version>1.3.0</micrometer-tracing.version>
+    <micrometer-tracing.version>1.3.1</micrometer-tracing.version>
     <t_digest.version>3.3</t_digest.version>
     <prometheus_client.version>0.16.0</prometheus_client.version>
     <reactive.version>1.0.4</reactive.version>
-    <reactor.version>3.6.6</reactor.version>
+    <reactor.version>3.6.7</reactor.version>
     <rxjava.version>2.2.21</rxjava.version>
     <okhttp_version>3.14.9</okhttp_version>
 
@@ -170,7 +170,7 @@
     <spotless.action>check</spotless.action>
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
-    <revision>3.2.14-SNAPSHOT</revision>
+    <revision>3.2.15-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -31,7 +31,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <revision>3.2.14-SNAPSHOT</revision>
+    <revision>3.2.15-SNAPSHOT</revision>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <curator5_version>5.1.0</curator5_version>
     <zookeeper_version>3.8.4</zookeeper_version>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -31,7 +31,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <revision>3.2.14-SNAPSHOT</revision>
+    <revision>3.2.15-SNAPSHOT</revision>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <curator_version>4.3.0</curator_version>
     <zookeeper_version>3.4.14</zookeeper_version>

diff --git a/...o-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java b/...o-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java
@@ -36,6 +36,7 @@
 import org.apache.dubbo.rpc.RpcContext;
 import org.apache.dubbo.rpc.RpcException;
 import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.model.ConsumerModel;
 import org.apache.dubbo.rpc.model.MethodDescriptor;
 import org.apache.dubbo.rpc.model.ServiceModel;
 import org.apache.dubbo.rpc.protocol.AbstractInvoker;
@@ -317,11 +318,18 @@ private Object rebuildValue(Invocation invocation, Invoker<?> invoker, Object or
         }
 
         Object value = originValue;
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
-            ServiceModel consumerServiceModel = getUrl().getServiceModel();
-            if (consumerServiceModel != null) {
-                Thread.currentThread().setContextClassLoader(consumerServiceModel.getClassLoader());
+            // 1. By default, the classloader of the current Thread is the consumer class loader.
+            ClassLoader consumerClassLoader = contextClassLoader;
+            ServiceModel serviceModel = getUrl().getServiceModel();
+            // 2. If there is a ConsumerModel in the url, the classloader of the ConsumerModel is consumerLoader
+            if (Objects.nonNull(serviceModel) && serviceModel instanceof ConsumerModel) {
+                consumerClassLoader = serviceModel.getClassLoader();
+            }
+            // 3. request result copy
+            if (Objects.nonNull(consumerClassLoader)) {
+                Thread.currentThread().setContextClassLoader(consumerClassLoader);
                 Type[] returnTypes = RpcUtils.getReturnTypes(invocation);
                 if (returnTypes == null) {
                     return originValue;
@@ -334,7 +342,7 @@ private Object rebuildValue(Invocation invocation, Invoker<?> invoker, Object or
             }
             return value;
         } finally {
-            Thread.currentThread().setContextClassLoader(cl);
+            Thread.currentThread().setContextClassLoader(contextClassLoader);
         }
     }
 

diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
@@ -36,8 +36,8 @@
   </modules>
 
   <properties>
-    <micrometer.version>1.13.0</micrometer.version>
-    <micrometer-tracing.version>1.3.0</micrometer-tracing.version>
+    <micrometer.version>1.13.1</micrometer.version>
+    <micrometer-tracing.version>1.3.1</micrometer-tracing.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
     <prometheus-client.version>0.16.0</prometheus-client.version>

diff --git a/dubbo-test/dubbo-test-spring/pom.xml b/dubbo-test/dubbo-test-spring/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
     <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
     <!--<spring_version>4.0.9.RELEASE</spring_version>-->
     <!--<spring_version>4.1.9.RELEASE</spring_version>-->
     <!--<spring_version>4.2.4.RELEASE</spring_version>-->

diff --git a/dubbo-test/dubbo-test-spring3.2/pom.xml b/dubbo-test/dubbo-test-spring3.2/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
   </properties>
 
   <dependencyManagement>

diff --git a/dubbo-test/dubbo-test-spring4.1/pom.xml b/dubbo-test/dubbo-test-spring4.1/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
   </properties>
 
   <dependencyManagement>

diff --git a/dubbo-test/dubbo-test-spring4.2/pom.xml b/dubbo-test/dubbo-test-spring4.2/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
   </properties>
 
   <dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -142,8 +142,8 @@
     <file_encoding>UTF-8</file_encoding>
     <!-- Maven plugins -->
     <maven_jar_version>3.4.1</maven_jar_version>
-    <maven_surefire_version>3.2.5</maven_surefire_version>
-    <maven_failsafe_version>3.2.5</maven_failsafe_version>
+    <maven_surefire_version>3.3.0</maven_surefire_version>
+    <maven_failsafe_version>3.3.0</maven_failsafe_version>
     <maven_deploy_version>2.8.2</maven_deploy_version>
     <maven_compiler_version>3.13.0</maven_compiler_version>
     <maven_source_version>3.3.1</maven_source_version>
@@ -169,7 +169,7 @@
     <spotless.action>check</spotless.action>
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
-    <revision>3.2.14-SNAPSHOT</revision>
+    <revision>3.2.15-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>
@@ -290,7 +290,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.1</version>
+          <version>3.7.0</version>
         </plugin>
         <plugin>
           <!-- Do NOT upgrade -->
@@ -448,7 +448,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
         <configuration>
           <autoVersionSubmodules>true</autoVersionSubmodules>
           <useReleaseProfile>false</useReleaseProfile>