fix(java): fix ClassLoader npe in loadOrGenCodecClass (#1346)

fix ClassLoader npe in `loadOrGenCodecClass` mentioned in #1340
apache · Jan 21, 2024 · 5b2b5e3 · 5b2b5e3
1 parent 9ec9adc
commit 5b2b5e3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java
@@ -479,15 +479,18 @@ protected Expression getOrCreateSerializer(Class<?> cls) {
       Class<? extends Serializer> serializerClass =
           visitFury(f -> f.getClassResolver().getSerializerClass(cls));
       Preconditions.checkNotNull(serializerClass, "Unsupported for class " + cls);
-      ClassLoader beanClassClassLoader =
-          beanClass.getClassLoader() == null
-              ? Thread.currentThread().getContextClassLoader()
-              : beanClass.getClassLoader();
       if (!ReflectionUtils.isPublic(serializerClass)) {
         // TODO(chaokunyang) add jdk17+ unexported class check.
         // non-public class can't be accessed in generated class.
         serializerClass = Serializer.class;
       } else {
+        ClassLoader beanClassClassLoader = beanClass.getClassLoader();
+        if (beanClassClassLoader == null) {
+          beanClassClassLoader = Thread.currentThread().getContextClassLoader();
+          if (beanClassClassLoader == null) {
+            beanClassClassLoader = Fury.class.getClassLoader();
+          }
+        }
         try {
           beanClassClassLoader.loadClass(serializerClass.getName());
         } catch (ClassNotFoundException e) {

diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java b/java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java
@@ -78,6 +78,9 @@ static <T> Class<? extends Serializer<T>> loadOrGenCodecClass(
         beanClass.getClassLoader() == null
             ? Thread.currentThread().getContextClassLoader()
             : beanClass.getClassLoader();
+    if (beanClassClassLoader == null) {
+      beanClassClassLoader = fury.getClass().getClassLoader();
+    }
     try {
       // generated code imported fury classes.
       beanClassClassLoader.loadClass(Fury.class.getName());

diff --git a/java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java b/java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java
@@ -114,6 +114,10 @@ public void returnFury(Fury fury) {
 
   /** todo setClassLoader support LoaderBinding.StagingType */
   public void setClassLoader(ClassLoader classLoader, LoaderBinding.StagingType stagingType) {
+    if (classLoader == null) {
+      // may be used to clear some classloader
+      classLoader = Fury.class.getClassLoader();
+    }
     classLoaderLocal.set(classLoader);
     getOrAddCache(classLoader);
   }

diff --git a/java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java b/java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java
@@ -109,6 +109,10 @@ public void setClassLoader(ClassLoader classLoader) {
    */
   public void setClassLoader(ClassLoader classLoader, StagingType stagingType) {
     if (this.loader != classLoader) {
+      if (classLoader == null) {
+        // may be used to clear some classloader
+        classLoader = Fury.class.getClassLoader();
+      }
       this.loader = classLoader;
       switch (stagingType) {
         case NO_STAGING: