Install fix for using nothing as null. Closes #130

Author: mkitti

Project.toml

@@ -1,6 +1,6 @@
 name = "JavaCall"
 uuid = "494afd89-becb-516b-aafa-70d2670c0337"
-version = "0.7.5"
+version = "0.7.6"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

src/convert.jl

@@ -21,7 +21,7 @@ convert(::Type{JavaObject{:short}}, n) = convert(jshort, n)
 convert(::Type{JavaObject{:float}}, n) = convert(jfloat, n)
 convert(::Type{JavaObject{:double}}, n) = convert(jdouble, n)
 convert(::Type{JavaObject{:void}}, n) = convert(jvoid, n)
-convert(::Type{JavaObject{T}}, ::Nothing) where T = jnull
+convert(o::Type{JavaObject{T}}, ::Nothing) where T = o(J_NULL)
 
 #Cast java object from S to T . Needed for polymorphic calls
 function convert(::Type{JavaObject{T}}, obj::JavaObject{S}) where {T,S}

src/core.jl

@@ -52,6 +52,7 @@ JavaGlobalRef(ref::JavaRef) = JavaGlobalRef(JNI.NewGlobalRef(Ptr(ref)))
 # _deleteref does local/global reference deletion without null or state checking
 _deleteref(ref::JavaLocalRef ) = JNI.DeleteLocalRef( Ptr(ref))
 _deleteref(ref::JavaGlobalRef) = JNI.DeleteGlobalRef(Ptr(ref))
+_deleteref(ref::JavaNullRef) = nothing
 
 """
     deleteref deletes a JavaRef using either JNI.DeleteLocalRef or JNI.DeleteGlobalRef

test/runtests.jl

@@ -30,6 +30,7 @@ JAVACALL_FORCE_ASYNC_TEST = get(ENV,"JAVACALL_FORCE_ASYNC_TEST","") ∈ ("1","ye
 end
 
 System = @jimport java.lang.System
+System_out = jfield(System, "out", @jimport java.io.PrintStream )
 @info "Java Version: ", jcall(System, "getProperty", JString, (JString,), "java.version")
 
 @testset "unsafe_strings_1" begin
@@ -96,6 +97,17 @@ end
     H=@jimport java.util.HashMap
     a=jcall(T, "testNull", H, ())
     @test_throws ErrorException jcall(a, "toString", JString, ())
+
+    jlist = @jimport java.util.ArrayList
+    @test jcall( jlist(), "add", jboolean, (JObject,), JObject(C_NULL)) === 0x01
+    @test jcall( jlist(), "add", jboolean, (JObject,), JObject(JavaCall.J_NULL)) === 0x01
+    @test jcall( jlist(), "add", jboolean, (JObject,), nothing) === 0x01
+    @test jcall( System_out , "print", Nothing , (JObject,), JObject(C_NULL)) === nothing
+    @test jcall( System_out , "print", Nothing , (JObject,), JObject(JavaCall.J_NULL)) === nothing
+    @test jcall( System_out , "print", Nothing , (JObject,), nothing) === nothing
+    @test jcall( System_out , "print", Nothing , (JString,), JString(C_NULL)) === nothing
+    @test jcall( System_out , "print", Nothing , (JString,), JString(JavaCall.J_NULL)) === nothing
+    @test jcall( System_out , "print", Nothing , (JString,), nothing) === nothing
 end
 
 @testset "arrays_1" begin