Fix getCallerClassLoader bug (#68)

sofastack · Apr 26, 2020 · 5abb1cf · 5abb1cf
1 parent 6ed1747
commit 5abb1cf
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-common-tools-parent</artifactId>
         <groupId>com.alipay.sofa.common</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/src/main/java/com/alipay/sofa/common/thread/SofaThreadPoolTaskExecutor.java b/core/src/main/java/com/alipay/sofa/common/thread/SofaThreadPoolTaskExecutor.java
@@ -31,13 +31,13 @@
  * Created on 2020/3/23
  */
 public class SofaThreadPoolTaskExecutor extends ThreadPoolTaskExecutor {
-    public static final String     SIMPLE_CLASS_NAME    = SofaThreadPoolTaskExecutor.class
-                                                            .getSimpleName();
-    private static long            DEFAULT_TASK_TIMEOUT = 30000;
-    private static long            DEFAULT_PERIOD       = 5000;
-    private static TimeUnit        DEFAULT_TIME_UNIT    = TimeUnit.MILLISECONDS;
+    public static final String       SIMPLE_CLASS_NAME    = SofaThreadPoolTaskExecutor.class
+                                                              .getSimpleName();
+    protected static long            DEFAULT_TASK_TIMEOUT = 30000;
+    protected static long            DEFAULT_PERIOD       = 5000;
+    protected static TimeUnit        DEFAULT_TIME_UNIT    = TimeUnit.MILLISECONDS;
 
-    private SofaThreadPoolExecutor sofaThreadPoolExecutor;
+    protected SofaThreadPoolExecutor sofaThreadPoolExecutor;
 
     @Override
     protected ExecutorService initializeExecutor(ThreadFactory threadFactory,
@@ -76,7 +76,7 @@ rejectedExecutionHandler, createName(), DEFAULT_TASK_TIMEOUT, DEFAULT_PERIOD,
         return executor;
     }
 
-    private String createName() {
+    protected String createName() {
         return SIMPLE_CLASS_NAME + String.format("%08x", this.hashCode());
     }
 

diff --git a/core/src/main/java/com/alipay/sofa/common/utils/ClassLoaderUtil.java b/core/src/main/java/com/alipay/sofa/common/utils/ClassLoaderUtil.java
@@ -51,7 +51,13 @@ public static Class loadClass(String className, Class referrer) throws ClassNotF
     public static ClassLoader getCallerClassLoader() {
         try {
             String callerClassName = Thread.currentThread().getStackTrace()[3].getClassName();
-            return loadClass(callerClassName).getClassLoader();
+
+            try {
+                return Class.forName(callerClassName).getClassLoader();
+            } catch (ClassNotFoundException e) {
+                return Class.forName(callerClassName, true, getContextClassLoader())
+                    .getClassLoader();
+            }
         } catch (Throwable t) {
             throw new RuntimeException("Failed to get caller classloader ", t);
         }

diff --git a/log-sofa-boot-starter/pom.xml b/log-sofa-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-common-tools-parent</artifactId>
         <groupId>com.alipay.sofa.common</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.alipay.sofa.common</groupId>
     <artifactId>sofa-common-tools-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <modules>
         <module>core</module>
         <module>log-sofa-boot-starter</module>
@@ -27,7 +27,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <logback.version>1.1.7</logback.version>
         <slf4j.version>1.7.21</slf4j.version>
-        <common.tools.version>1.1.0</common.tools.version>
+        <common.tools.version>1.1.1</common.tools.version>
         <log4j2.version>2.3</log4j2.version>
         <java.version>1.6</java.version>
     </properties>

diff --git a/test/pom.xml b/test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-common-tools-parent</artifactId>
         <groupId>com.alipay.sofa.common</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>