#922 Fall back to default class resolution if class cannot be loaded …

…with provided class loader
EsotericSoftware · Nov 17, 2022 · a19035b · a19035b
1 parent cb1cd85
commit a19035b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/com/esotericsoftware/kryo/serializers/JavaSerializer.java b/src/com/esotericsoftware/kryo/serializers/JavaSerializer.java
@@ -84,8 +84,13 @@ private static class ObjectInputStreamWithKryoClassLoader extends ObjectInputStr
 		protected Class resolveClass (ObjectStreamClass type) {
 			try {
 				return Class.forName(type.getName(), false, kryo.getClassLoader());
+			} catch (ClassNotFoundException ignored) {}
+			try {
+				return super.resolveClass(type);
 			} catch (ClassNotFoundException ex) {
 				throw new KryoException("Class not found: " + type.getName(), ex);
+			} catch (IOException ex) {
+				throw new KryoException("Could not load class: " + type.getName(), ex);
 			}
 		}
 	}

diff --git a/test/com/esotericsoftware/kryo/serializers/JavaSerializerTest.java b/test/com/esotericsoftware/kryo/serializers/JavaSerializerTest.java
@@ -22,6 +22,8 @@
 import com.esotericsoftware.kryo.KryoTestCase;
 
 import java.io.Serializable;
+import java.net.URL;
+import java.net.URLClassLoader;
 
 import org.junit.jupiter.api.Test;
 
@@ -42,6 +44,17 @@ void testJavaSerializer () {
 		roundTrip(146, test);
 	}
 
+	@Test
+	void testJavaSerializerFallbackToDefaultClassLoader () {
+		kryo.setClassLoader(new URLClassLoader(new URL[]{}, null));
+
+		kryo.register(TestClass.class, new JavaSerializer());
+
+		TestClass test = new TestClass();
+		test.intField = 54321;
+		roundTrip(139, test);
+	}
+
 	public static class TestClass implements Serializable {
 		String stringField;
 		int intField;