rjb 1.3.5-x86-mswin32-60 → 1.3.8-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,22 @@
+Sat Dec 03 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.3.8
+	ignore attach_jvm after rjb was unloaded. (Bug #29451)
+ *test/test_unload.rb
+	add test for unload. if Rjb run after unloading then it causes crush.
+Wed Nov 09 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.3.7
+ *test/test.rb (test_reraise_exception)
+	skip test if RUBY_VERSION =~ /^1\.8/
+Wed Nov 09 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.3.6
+ *ext/rjbexception.c
+	add to_str method into the exception class.
+	ruby internally calls the method when reraising the exception.
+ *test/test.rb (test_reraise_exception)
+	add reraise test
 Mon Jul 18 arton
  *ext/rjb.c
 	fix inhiritance test.

data/ext/rjb.c

@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 170 2011-07-18 12:45:13Z arton $
+ * $Id: rjb.c 178 2011-12-02 16:14:56Z arton $
  */
 
-#define RJB_VERSION "1.3.5"
+#define RJB_VERSION "1.3.8"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -131,6 +131,7 @@ static jmethodID get_system_classloader;
 static jclass j_url_loader;
 static jobject url_loader;
 static jmethodID url_loader_new;
+static jmethodID url_geturls;
 /* URL global reference */
 static jclass j_url;
 static jmethodID url_new;
@@ -165,6 +166,7 @@ typedef struct jobject_ruby_table {
 JNIEnv* rjb_attach_current_thread(void)
 {
   JNIEnv* env;
+  if (!rjb_jvm) return NULL;
   (*rjb_jvm)->AttachCurrentThread(rjb_jvm, (void**)&env, '\0');
   return env;
 }
@@ -1965,8 +1967,11 @@ static VALUE rjb_delete_ref(struct jvi_data* ptr)
 static VALUE rj_bridge_free(struct rj_bridge* ptr)
 {
     JNIEnv* jenv = rjb_attach_current_thread();    
-    (*jenv)->DeleteLocalRef(jenv, ptr->proxy);    
-    (*jenv)->DeleteLocalRef(jenv, ptr->bridge);
+    if (jenv)
+    {
+        (*jenv)->DeleteLocalRef(jenv, ptr->proxy);    
+        (*jenv)->DeleteLocalRef(jenv, ptr->bridge);
+    }
     return Qnil;
 }
 
@@ -2551,6 +2556,8 @@ static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
                         "(Ljava/lang/String;)Ljava/lang/Class;");
         RJB_LOAD_METHOD(url_loader_new, j_url_loader, "<init>",
                         "([Ljava/net/URL;Ljava/lang/ClassLoader;)V");
+        RJB_LOAD_METHOD(url_geturls, j_url_loader, "getURLs",
+                        "()[Ljava/net/URL;");
     }
     args[0].l = (*jenv)->NewObjectArray(jenv, (count == 0) ? 1 : count, j_url, NULL);
     rjb_check_exception(jenv, 0);    
@@ -2575,6 +2582,17 @@ static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
     return Qtrue;
 }
 
+static VALUE rjb_s_urls(VALUE self)
+{
+    JNIEnv* jenv;
+    jvalue ret;
+    if (!url_loader) return Qnil;
+    jenv = rjb_prelude();
+    ret.l = (*jenv)->CallObjectMethod(jenv, url_loader, url_geturls);
+    return jarray2rv(jenv, ret);
+}
+
+
 /*
  * return class name
  */
@@ -3155,6 +3173,7 @@ void Init_rjbcore()
     rb_define_module_function(rjb, "add_classpath", rjb_s_add_classpath, 1);
     rb_define_module_function(rjb, "add_jar", rjb_s_add_jar, 1);
     rb_define_alias(rjb, "add_jars", "add_jar");
+    rb_define_module_function(rjb, "urls", rjb_s_urls, 0);
     rb_define_const(rjb, "VERSION", rb_str_new2(RJB_VERSION));
     rb_define_class_variable(rjb, "@@classpath", rb_ary_new());
     cvar_classpath = rb_intern("@@classpath");

data/ext/rjbexception.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 126 2010-07-22 13:58:15Z arton $
+ * $Id: rjbexception.c 174 2011-11-09 13:47:43Z arton $
  */
 
 #include "ruby.h"
@@ -32,6 +32,12 @@ static VALUE missing_delegate(int argc, VALUE* argv, VALUE self)
     return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
 }
 
+static VALUE exception_to_s(VALUE self)
+{
+    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")),
+                      rb_intern("toString"), 0);
+}
+
 /*
  * handle Java exception
  *  At this time, the Java exception is defined without the package name.
@@ -61,6 +67,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     {
 	rexp = rb_define_class(pcls, rb_eStandardError);
         rb_define_method(rexp, "method_missing", missing_delegate, -1);
+        rb_define_method(rexp, "to_str", exception_to_s, 0);
 #if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)
 	rb_hash_aset(rjb_loaded_classes, cname, rexp);
 #else

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 170 2011-07-18 12:45:13Z arton $
+# $Id: test.rb 176 2011-11-09 14:27:28Z arton $
 
 begin
   require 'rjb'
@@ -792,5 +792,24 @@ class TestRjb < Test::Unit::TestCase
     assert_equal 'method1', ret[0]
     assert_equal 'method2', ret[1]
   end
+
+  def cause_exception
+    begin
+      @jInteger.parseInt('blabla')
+    rescue NumberFormatException => e
+      raise
+    end
+  end
+
+  def test_reraise_exception()
+   unless /^1\.8/ =~ RUBY_VERSION
+      begin
+        cause_exception
+      rescue
+        assert($!.to_s =~ /NumberFormatException/)
+      end
+   end
+  end
+  
 end
 

data/test/test_unload.rb

@@ -0,0 +1,26 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id: test.rb 176 2011-11-09 14:27:28Z arton $
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+class TestUnloadRjb < Test::Unit::TestCase
+  include Rjb
+  def setup
+    Rjb::load('.')
+  end
+  
+  def test_unload
+    jString = import('java.lang.String')
+    assert_equal 0, Rjb::unload
+    jString = nil
+    GC.start
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 11
+  prerelease: false
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 8
+  version: 1.3.8
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +09:00
+date: 2011-12-03 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -48,21 +48,14 @@ files:
 - samples/unzip.rb
 - test/test.rb
 - test/exttest.rb
+- test/test_unload.rb
 - test/test_osxjvm.rb
 - test/gctest.rb
-- test/jp/co/infoseek/hp/arton/rjb/JTest.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
-- test/Base.class
-- test/JTest.class
-- test/IBase.class
-- test/Test.class
-- test/Test$TestTypes.class
 - test/TwoCaller.class
 - test/Two.class
-- test/JarTest.class
-- test/ExtBase.class
 - test/rjbtest.jar
 - test/jartest.jar
 - COPYING
@@ -104,7 +97,7 @@ requirements:
 - JDK 5.0
 - " VC6 version of Ruby"
 rubyforge_project: rjb
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge