rjb 1.3.7 → 1.3.8

data/ChangeLog

@@ -1,3 +1,9 @@
+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

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 176 2011-11-09 14:27:28Z arton $
+ * $Id: rjb.c 178 2011-12-02 16:14:56Z arton $
  */
 
-#define RJB_VERSION "1.3.7"
+#define RJB_VERSION "1.3.8"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -166,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;
 }
@@ -1966,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;
 }
 

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

@@ -2,7 +2,7 @@
 name: rjb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors: 
 - arton
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 +09:00
-default_executable: 
+date: 2011-12-02 00:00:00 Z
 dependencies: []
 
 description: |
@@ -42,6 +41,7 @@ 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/Base.class
@@ -58,7 +58,6 @@ files:
 - readme.sj
 - readme.txt
 - ext/extconf.rb
-has_rdoc: true
 homepage: http://rjb.rubyforge.org/
 licenses: []
 
@@ -83,7 +82,7 @@ requirements:
 - none
 - JDK 5.0
 rubyforge_project: rjb
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge