classLoader as switch

Author: johnno1962

Package.swift

@@ -11,6 +11,6 @@ import PackageDescription
 let package = Package(
     name: "java_swift",
     dependencies: [
-        .Package(url: "https://github.com/SwiftJava/CJavaVM.git", versions: Version(1,0,0)..<Version(10,0,0)),
+        .Package(url: "https://github.com/SwiftJava/CJavaVM.git", versions: Version(1,1,4)..<Version(10,0,0)),
         ]
 )

Sources/JNICore.swift

@@ -183,10 +183,12 @@ open class JNICore {
     open func FindClass( _ name: UnsafePointer<Int8>, _ file: StaticString = #file, _ line: Int = #line ) -> jclass? {
         autoInit()
         ExceptionReset()
-        var clazz: jclass? = api.FindClass( env, name )
+        var clazz: jclass?
 
-        if clazz == nil && classLoader != nil {
-            api.ExceptionClear( env )
+        if classLoader == nil {
+            clazz = api.FindClass( env, name )
+        }
+        else {
             var locals = [jobject]()
             var args = [jvalue(l: String(cString: name).localJavaObject(&locals))]
             clazz = JNIMethod.CallObjectMethod(object: classLoader,
@@ -196,6 +198,7 @@ open class JNICore {
                                                args: &args,
                                                locals: &locals)
         }
+
         if clazz == nil {
             report( "Could not find class \(String( cString: name ))", file, line )
             if strncmp( name, "org/swiftjava/", 14 ) == 0 {