Merge pull request #78 from ExpandingMan/javaerrors

some slightly better error handling

Author: aviks

src/JavaCall.jl

@@ -13,7 +13,7 @@ using Compat.Sys: iswindows, islinux, isunix, isapple
 import DataStructures: OrderedSet
 
 if VERSION < v"0.7-"
-    using Compat: @warn, @error
+    using Compat: @warn
     import Base: isnull
     Base.finalizer(f::Function, o) = Base.finalizer(o, f)
 else

src/convert.jl

@@ -8,14 +8,14 @@ function convert(::Type{JavaObject{T}}, obj::JavaObject{S}) where {T,S}
         ptr === C_NULL && geterror()
         return JavaObject{T}(ptr)
     end
-    isnull(obj) && @error("Cannot convert NULL")
+    isnull(obj) && throw(ArgumentError("Cannot convert NULL"))
     realClass = ccall(jnifunc.GetObjectClass, Ptr{Nothing}, (Ptr{JNIEnv}, Ptr{Nothing} ), penv, obj.ptr)
     if isConvertible(T, realClass)  #dynamic cast
         ptr = ccall(jnifunc.NewLocalRef, Ptr{Nothing}, (Ptr{JNIEnv}, Ptr{Nothing}), penv, obj.ptr)
         ptr === C_NULL && geterror()
         return JavaObject{T}(ptr)
     end
-    @error("Cannot cast java object from $S to $T")
+    throw(JavaCallError("Cannot cast java object from $S to $T"))
 end
 
 #Is java type convertible from S to T.

src/core.jl

@@ -127,7 +127,7 @@ function jnew(T::Symbol, argtypes::Tuple, args...)
                       (Ptr{JNIEnv}, Ptr{Nothing}, Ptr{UInt8}, Ptr{UInt8}), penv, metaclass(T),
                       String("<init>"), sig)
     if jmethodId == C_NULL
-        @error("No constructor for $T with signature $sig")
+        throw(JavaCallError("No constructor for $T with signature $sig"))
     end
     return  _jcall(metaclass(T), jmethodId, jnifunc.NewObjectA, JavaObject{T}, argtypes, args...)
 end
@@ -217,7 +217,7 @@ for (x, y, z) in [ (:jboolean, :(jnifunc.CallBooleanMethodA), :(jnifunc.CallStat
             end
             @assert callmethod != C_NULL
             @assert jmethodId != C_NULL
-            isnull(obj) && @error("Attempt to call method on Java NULL")
+            isnull(obj) && throw(JavaCallError("Attempt to call method on Java NULL"))
             savedArgs, convertedArgs = convert_args(argtypes, args...)
             result = ccall(callmethod, $x , (Ptr{JNIEnv}, Ptr{Nothing}, Ptr{Nothing}, Ptr{Nothing}), penv, obj.ptr, jmethodId, convertedArgs)
             result==C_NULL && geterror()
@@ -254,7 +254,7 @@ global const _jmc_cache = Dict{Symbol, JavaMetaClass}()
 function _metaclass(class::Symbol)
     jclass=javaclassname(class)
     jclassptr = ccall(jnifunc.FindClass, Ptr{Nothing}, (Ptr{JNIEnv}, Ptr{UInt8}), penv, jclass)
-    jclassptr == C_NULL && @error("Class Not Found $jclass")
+    jclassptr == C_NULL && throw(JavaCallError("Class Not Found $jclass"))
     return JavaMetaClass(class, jclassptr)
 end
 
@@ -275,28 +275,28 @@ function geterror(allow=false)
 
     if isexception == JNI_TRUE
         jthrow = ccall(jnifunc.ExceptionOccurred, Ptr{Nothing}, (Ptr{JNIEnv},), penv)
-        jthrow==C_NULL && @error("Java Exception thrown, but no details could be retrieved from the JVM")
+        jthrow==C_NULL && throw(JavaCallError("Java Exception thrown, but no details could be retrieved from the JVM"))
         ccall(jnifunc.ExceptionDescribe, Nothing, (Ptr{JNIEnv},), penv ) #Print java stackstrace to stdout
         ccall(jnifunc.ExceptionClear, Nothing, (Ptr{JNIEnv},), penv )
         jclass = ccall(jnifunc.FindClass, Ptr{Nothing}, (Ptr{JNIEnv},Ptr{UInt8}), penv,
                        "java/lang/Throwable")
-        jclass==C_NULL && @error("Java Exception thrown, but no details could be retrieved from the JVM")
+        jclass==C_NULL && throw(JavaCallError("Java Exception thrown, but no details could be retrieved from the JVM"))
         jmethodId=ccall(jnifunc.GetMethodID, Ptr{Nothing},
                         (Ptr{JNIEnv}, Ptr{Nothing}, Ptr{UInt8}, Ptr{UInt8}), penv, jclass, "toString",
                         "()Ljava/lang/String;")
-        jmethodId==C_NULL && @error("Java Exception thrown, but no details could be retrieved from the JVM")
+        jmethodId==C_NULL && throw(JavaCallError("Java Exception thrown, but no details could be retrieved from the JVM"))
         res = ccall(jnifunc.CallObjectMethodA, Ptr{Nothing},
                     (Ptr{JNIEnv}, Ptr{Nothing}, Ptr{Nothing}, Ptr{Nothing}), penv, jthrow, jmethodId,
                     C_NULL)
-        res==C_NULL && error("Java Exception thrown, but no details could be retrieved from the JVM")
+        res==C_NULL && throw(JavaCallError("Java Exception thrown, but no details could be retrieved from the JVM"))
         msg = unsafe_string(JString(res))
         ccall(jnifunc.DeleteLocalRef, Nothing, (Ptr{JNIEnv}, Ptr{Nothing}), penv, jthrow)
-        @error(string("Error calling Java: ",msg))
+        throw(JavaCallError(string("Error calling Java: ",msg)))
     else
         if allow==false
             return #No exception pending, legitimate NULL returned from Java
         else
-            @error("Null from Java. Not known how")
+            throw(JavaCallError("Null from Java. Not known how"))
         end
     end
 end

src/jnienv.jl

@@ -329,4 +329,6 @@ struct JavaVM
     JNIInvokeInterface_::Ptr{JNIInvokeInterface}
 end
 
-
+struct JavaCallError <: Exception
+    msg::String
+end

src/jvm.jl

@@ -104,7 +104,7 @@ function findjvm()
     for path in libpaths
         push!(errorMsg,"\n   $path")
     end
-    error(reduce(*,errorMsg));
+    throw(JavaCallError(reduce(*,errorMsg)))
 end
 
 
@@ -158,8 +158,8 @@ end
 
 isloaded() = isdefined(JavaCall, :jnifunc) && isdefined(JavaCall, :penv) && penv != C_NULL
 
-assertloaded() = isloaded() ? nothing : @error("JVM not initialised. Please run init()")
-assertnotloaded() = isloaded() ? @error("JVM already initialised") : nothing
+assertloaded() = isloaded() ? nothing : throw(JavaCallError("JVM not initialised. Please run init()"))
+assertnotloaded() = isloaded() ? throw(JavaCallError("JVM already initialised")) : nothing
 
 # Pointer to pointer to pointer to pointer alert! Hurrah for unsafe load
 function init(opts)
@@ -171,7 +171,7 @@ function init(opts)
                              convert(Ptr{JavaVMOption}, pointer(opt)), JNI_TRUE)
     res = ccall(create, Cint, (Ptr{Ptr{JavaVM}}, Ptr{Ptr{JNIEnv}}, Ptr{JavaVMInitArgs}), ppjvm, ppenv,
                 Ref(vm_args))
-    res < 0 && @error("Unable to initialise Java VM: $(res)")
+    res < 0 && throw(JavaCallError("Unable to initialise Java VM: $(res)"))
     global penv = ppenv[1]
     global pjvm = ppjvm[1]
     jnienv = unsafe_load(penv)
@@ -183,9 +183,9 @@ end
 
 function destroy()
     if (!isdefined(JavaCall, :penv) || penv == C_NULL)
-        @error("Called destroy without initialising Java VM")
+        throw(JavaCallError("Called destroy without initialising Java VM"))
     end
     res = ccall(jvmfunc.DestroyJavaVM, Cint, (Ptr{Nothing},), pjvm)
-    res < 0 && @error("Unable to destroy Java VM")
+    res < 0 && throw(JavaCallError("Unable to destroy Java VM"))
     global penv=C_NULL; global pjvm=C_NULL;
 end