fallback

Author: madsodgaard

Sources/SwiftJava/AnyJavaObject.swift

@@ -110,10 +110,10 @@ extension AnyJavaObject {
   private static func _withJNIClassFromCustomClassLoader<Result>(
     _ classLoader: JavaClassLoader,
     in environment: JNIEnvironment,
-    _ body: (jclass) throws -> Result
+    _ body: (jclass?) throws -> Result
   ) throws -> Result {
-    let resolvedClass = try classLoader.findClass(fullJavaClassName)
-    return try body(resolvedClass!.javaThis)
+    let resolvedClass = try? classLoader.findClass(fullJavaClassName)
+    return try body(resolvedClass?.javaThis)
   }
 
   /// Retrieve the Java class for this type and execute body().
@@ -124,7 +124,14 @@ extension AnyJavaObject {
   ) throws -> Result {
     if let AnyJavaObjectWithCustomClassLoader = self as? AnyJavaObjectWithCustomClassLoader.Type,
        let customClassLoader = try AnyJavaObjectWithCustomClassLoader.getJavaClassLoader(in: environment) {
-      try _withJNIClassFromCustomClassLoader(customClassLoader, in: environment, body)
+      try _withJNIClassFromCustomClassLoader(customClassLoader, in: environment) { clazz in
+        guard let clazz else {
+          // If the custom class loader did not find the class
+          // let's look in the default class loader.
+          return try _withJNIClassFromDefaultClassLoader(in: environment, body)
+        }
+        return try body(clazz)
+      }
     } else {
       try _withJNIClassFromDefaultClassLoader(in: environment, body)
     }