Merge branch 'sofastack:master' into master

sofastack · Mar 20, 2024 · b2b0243 · b2b0243
2 parents 1790b70 + 45cd609
commit b2b0243
Showing 1 changed file with 13 additions and 26 deletions.
diff --git a/...ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/invoke/DynamicJvmServiceInvoker.java b/...ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/invoke/DynamicJvmServiceInvoker.java
@@ -40,24 +40,24 @@
  */
 public class DynamicJvmServiceInvoker extends ServiceProxy {
 
-    private static final Logger            LOGGER            = SofaBootLoggerFactory
-                                                                 .getLogger(DynamicJvmServiceInvoker.class);
+    private static final Logger   LOGGER          = SofaBootLoggerFactory
+                                                      .getLogger(DynamicJvmServiceInvoker.class);
 
-    private final Contract                 contract;
-    private final Object                   targetService;
-    private final String                   bizIdentity;
-    private final ThreadLocal<ClassLoader> clientClassloader = new ThreadLocal<>();
-    private final boolean                  serialize;
+    private final Contract        contract;
+    private final Object          targetService;
+    private final String          bizIdentity;
+    private final ClassLoader     clientClassloader;
+    private final boolean         serialize;
 
-    static protected final String          TOSTRING_METHOD   = "toString";
-    static protected final String          EQUALS_METHOD     = "equals";
-    static protected final String          HASHCODE_METHOD   = "hashCode";
+    static protected final String TOSTRING_METHOD = "toString";
+    static protected final String EQUALS_METHOD   = "equals";
+    static protected final String HASHCODE_METHOD = "hashCode";
 
     public DynamicJvmServiceInvoker(ClassLoader clientClassloader, ClassLoader serviceClassLoader,
                                     Object targetService, Contract contract, String bizIdentity,
                                     boolean serialize) {
         super(serviceClassLoader);
-        this.clientClassloader.set(clientClassloader);
+        this.clientClassloader = clientClassloader;
         this.targetService = targetService;
         this.contract = contract;
         this.bizIdentity = bizIdentity;
@@ -103,18 +103,17 @@ protected Object doInvoke(MethodInvocation invocation) throws Throwable {
                 }
             } else {
                 Object[] arguments = (Object[]) hessianTransport(targetArguments, null);
-                Class[] argumentTypes = (Class[]) hessianTransport(oldArgumentTypes, null);
+                Class<?>[] argumentTypes = (Class<?>[]) hessianTransport(oldArgumentTypes, null);
                 transformMethod = getTargetMethod(targetMethod, argumentTypes);
                 Object retVal = transformMethod.invoke(targetService, arguments);
-                return hessianTransport(retVal, getClientClassloader());
+                return hessianTransport(retVal, clientClassloader);
             }
         } catch (InvocationTargetException ex) {
             throw ex.getTargetException();
         } finally {
             if (DynamicJvmServiceProxyFinder.getInstance().getBizManagerService() != null) {
                 ReplayContext.clearPlaceHolder();
             }
-            clearClientClassloader();
         }
     }
 
@@ -136,18 +135,6 @@ public Class<?> getInterfaceType() {
         return contract.getInterfaceType();
     }
 
-    public ClassLoader getClientClassloader() {
-        return clientClassloader.get();
-    }
-
-    public void setClientClassloader(ClassLoader clientClassloader) {
-        this.clientClassloader.set(clientClassloader);
-    }
-
-    public void clearClientClassloader() {
-        this.clientClassloader.remove();
-    }
-
     private Method getTargetMethod(Method method, Class<?>[] argumentTypes) {
         try {
             return targetService.getClass().getMethod(method.getName(), argumentTypes);