rjb 1.1.5-x86-mswin32-60 → 1.1.6-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,7 @@
+Tue Aug 26 arton
+ *ext/load.c, rjb.c, rjb.h
+	export safe_funcall under the prefix 'rjb'.
+	calling DL with rb_protect for avoiding exception.
 Mon Aug 25 arton
  *ext/load.c
 	Fix checking the result for loading alternate_jvm_type.

data/ext/jniwrap.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: jniwrap.h 80 2008-08-25 12:56:50Z arton $
+ * $Id: jniwrap.h 82 2008-08-26 12:51:51Z arton $
  */
 #ifndef _Included_jniwrap
 #define _Included_jniwrap

data/ext/load.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 80 2008-08-25 12:56:50Z arton $
+ * $Id: load.c 82 2008-08-26 12:51:51Z arton $
  */
 
 #include <stdlib.h>
@@ -90,6 +90,8 @@ static int load_jvm(char* jvmtype)
     char* libpath;
     char* java_home;
     char* jh;
+    int sstat;
+    VALUE* argv;
 
     jh = getenv("JAVA_HOME");
 #if defined(__APPLE__) && defined(__MACH__)
@@ -150,9 +152,16 @@ static int load_jvm(char* jvmtype)
 	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
 	return 0;
     }
-    
-    jvmdll = rb_funcall(rb_const_get(rb_cObject, rb_intern("DL")), rb_intern("dlopen"), 1, rb_str_new2(libpath));
-
+    argv = ALLOCA_N(VALUE, 4);
+    *argv = rb_const_get(rb_cObject, rb_intern("DL"));
+    *(argv + 1) = rb_intern("dlopen");
+    *(argv + 2) = 1;
+    *(argv + 3) = rb_str_new2(libpath);
+    jvmdll = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
+    if (sstat)
+    {
+        return 0;
+    }
     /* get function pointers of JNI */
 #if RJB_RUBY_VERSION_CODE < 190
     getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2("JNI_GetDefaultJavaVMInitArgs"), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 

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 80 2008-08-25 12:56:50Z arton $
+ * $Id: rjb.c 82 2008-08-26 12:51:51Z arton $
  */
 
-#define RJB_VERSION "1.1.5"
+#define RJB_VERSION "1.1.6"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -2779,7 +2779,7 @@ void Init_rjbcore()
     rb_gc_register_address(&rjbb);
 }
 
-static VALUE safe_funcall(VALUE args)
+VALUE rjb_safe_funcall(VALUE args)
 {
     VALUE* argp = (VALUE*)args;
     return rb_funcall2(*argp, *(argp + 1), *(argp + 2), argp + 3);
@@ -2829,7 +2829,7 @@ JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
             *argv = ptr->wrapped;
             *(argv + 1) = id;
             *(argv + 2) = argc - 3;
-            result = rb_protect(safe_funcall, (VALUE)argv, &sstat);
+            result = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
 	    rv2jobject(jenv, result, &j, NULL, 0);
 	    /* I can't delete this object... */
             break;

data/ext/rjb.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.h 64 2008-03-05 14:24:22Z kuwa1 $
+ * $Id: rjb.h 82 2008-08-26 12:51:51Z arton $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision
@@ -69,6 +69,7 @@ extern JNIEnv* rjb_attach_current_thread(void);
 extern jclass rjb_find_class(JNIEnv* jenv, VALUE name);
 extern void rjb_release_string(JNIEnv *jenv, jstring str, const char* chrs);
 extern VALUE rjb_load_vm_default();
+extern VALUE rjb_safe_funcall(VALUE args);
 
 /* in rjbexception.c */
 extern VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-25 00:00:00 +09:00
+date: 2008-08-26 00:00:00 +09:00
 default_executable: 
 dependencies: []