Options passed to init are combined with those via addClassPath, addOpts

Address #59 Path added with `addClassPath` ignored by `init(opts)` method

Author: mkitti

src/jvm.jl

@@ -232,16 +232,16 @@ addJarsToClassPath(args...) = isloaded() ?
     @warn("JVM already initialized. This call has no effect") :
     _addJarsToClassPath(args...)
 
-addOpts(s::String) = isloaded() ? @warn("JVM already initialised. This call has no effect") : push!(opts, s)
-
-function init()
-    if isempty(cp)
-        init(opts)
+function addOpts(s::String)
+    if isloaded()
+        @warn("JVM already initialised. This call has no effect")
     else
-        ccp = collect(cp)
-        options = collect(opts)
-        classpath = "-Djava.class.path="*join(ccp,sep)
-        init(vcat(options, classpath))
+        m = match(r"^-Djava.class.path=(.*)",s)
+        if m != nothing
+            addClassPath(String(m.captures[1]))
+        else
+            push!(opts, s)
+        end
     end
 end
 
@@ -267,8 +267,46 @@ isloaded() = isdefined(JavaCall, :jnifunc) && isdefined(JavaCall, :penv) && penv
 assertloaded() = isloaded() ? nothing : throw(JavaCallError("JVM not initialised. Please run init()"))
 assertnotloaded() = isloaded() ? throw(JavaCallError("JVM already initialised")) : nothing
 
+"""
+    JavaCall.init(opts::Array{String,1})
+    JavaCall.init(opt1::String,opt2::String, ...)
+    JavaCall.init()
+
+    Initialize JavaCall with JVM options.
+
+    As of JavaCall v0.7.4 new options passed to init will be appended
+    to previous options added with addClasspath and addOpts.
+
+    Once init() is called, addClasspath and addOpts no longer have any effect.
+
+    See http://juliainterop.github.io/JavaCall.jl/methods.html
+
+    Example
+    JavaCall.init(["-Xmx512M", "-Djava.class.path=$(@__DIR__)", "-verbose:jni", "-verbose:gc"])
+"""
+function init(opts::Array{String,1})
+    addOpts.(opts)
+    init()
+end
+
+# Accept options strings as a set of arguments
+init(opts::Array{AbstractString,1}) = init(String.(opts))
+init(opts::Vararg{AbstractString,N}) where N = init(String.([opts...]))
+
+function init()
+    if isempty(cp)
+        _init(opts)
+    else
+        ccp = collect(cp)
+        options = collect(opts)
+        classpath = "-Djava.class.path="*join(ccp,sep)
+        _init(vcat(options, classpath))
+    end
+end
+
+# Below is the original main initialization option
 # Pointer to pointer to pointer to pointer alert! Hurrah for unsafe load
-function init(opts)
+function _init(opts)
     assertnotloaded()
     assertroottask_or_goodenv()
     opt = [JavaVMOption(pointer(x), C_NULL) for x in opts]

test/runtests.jl

@@ -16,11 +16,15 @@ JAVACALL_FORCE_ASYNC_INIT = get(ENV,"JAVACALL_FORCE_ASYNC_INIT","") ∈ ("1","ye
 JAVACALL_FORCE_ASYNC_TEST = get(ENV,"JAVACALL_FORCE_ASYNC_TEST","") ∈ ("1","yes")
 
 @testset "initialization" begin
+    JavaCall.addClassPath("foo")
+    JavaCall.addOpts("-Djava.class.path=bar")
+    JavaCall.addOpts("-Xmx512M")
     if JavaCall.JULIA_COPY_STACKS || JAVACALL_FORCE_ASYNC_INIT
         @testasync JavaCall.init(["-Djava.class.path=$(@__DIR__)"])==nothing
     else
         @test JavaCall.init(["-Djava.class.path=$(@__DIR__)"])==nothing
     end
+    @test match(r"foo[:;]+bar",JavaCall.getClassPath()) != nothing
     # JavaCall.init(["-verbose:gc","-Djava.class.path=$(@__DIR__)"])
     # JavaCall.init()
 end