rjb 1.1.2-x86-mswin32-60 → 1.1.4-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,52 @@
+Thu Aug 14 arton
+ *ext/rjb.c, load.c, etc
+	change comment line // -> /* */ because AIX's compiler
+	add _AIX for load.c (this patch from Ittay Dror, thanks)
+ *ext/load.c
+	add ALT_JVM_TYPE for alternative jvm directory (by Kumar)
+Sun Jul 13 arton
+ *ext/rjb.c
+	display warning when Rjb load jvm implicitly if $DEBUG or $VERBOSE.
+Mon May 26 arton
+ *ext/rjb.c
+	correct char primitive conversion for Bigendian machine.
+	use macroes for loading classes
+ *ext/load.c
+	adjust OS X's directory
+ *ext/extconf.rb	
+	adjust OS X's directory if Home exists	
+Thu Mar 27 arton
+ *ext/rjb.c
+	mark version 1.1.4 for the next release.
+ *test/test.rb
+	remove unload, because it fails. 
+	It's more important to assert each functions.
+Thu Mar 27 arton
+ *ext/riconv.c
+	activate conv tables for getenv configuration.
+Tue Mar 5 Kuwashima
+ *ext/rjb.c
+ *ext/rjb.h
+ *ext/rjbexception.c
+ 	add auto load method.
+Tue Mar  4 Kuwashima
+ *ext/rjbexception.c
+ *ext/rjb.c
+ *test/test.rb
+ 	clear(ignore) exception in current java thread, before some operation.
+ *ext/rjbexception.c
+ *ext/rjb.c
+	add auto load for Rjb::bind, Rjb::throw
+ *ext/rjb.c
+ *test/test.rb
+	add Rjb::unbind
+ *test/test.rb
+ 	add loading rubygems 
+Sat Feb 23 arton
+ *test/test.rb
+	let test_field metod use Test.class instead of Point.class
+ *test/Test.java
+	add a public field for testing
 Fri Feb 22 arton
  *ext/rjb.c
 	mark version 1.1.3 for the next release.

data/ext/extconf.h

@@ -4,5 +4,5 @@
 #define HAVE_DL_H 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 186
+#define RJB_RUBY_VERSION_CODE 187
 #endif

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 60 2008-02-21 20:11:37Z arton $
+ * $Id: jniwrap.h 78 2008-08-14 10:47:31Z 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 43 2007-12-26 18:55:04Z kuwa1 $
+ * $Id: load.c 77 2008-08-14 10:22:35Z arton $
  */
 
 #include <stdlib.h>
@@ -33,6 +33,7 @@
 #include "rjb.h"
 
 #define JVM_TYPE "client"
+#define ALT_JVM_TYPE "classic"
 
 #if defined(_WIN32) || defined(__CYGWIN__)
  #if defined(__CYGWIN__)
@@ -47,6 +48,12 @@
   #define JVMDLL "%s/Libraries/libjvm_compat.dylib"
   #define DIRSEPARATOR '/'
   #define CLASSPATH_SEP ':'
+  #define HOME_NAME "/Home"
+  #define HOME_NAME_LEN strlen(HOME_NAME)
+  #define DEFAULT_HOME "/System/Library/Frameworks/JavaVM.framework"
+#elif defined(_AIX)
+  #define ARCH "ppc"
+  #define JVM_TYPE "j9vm"
 #else /* defined(_WIN32) || defined(__CYGWIN__) */
  #if defined(__sparc_v9__)
    #define ARCH "sparcv9"
@@ -83,16 +90,30 @@ static int load_jvm(char* jvmtype)
     char* libpath;
     char* java_home;
     char* jh;
-    VALUE dl;
-    VALUE importer;
 
-#if defined(__APPLE__) && defined(__MACH__)
-    jh = "/System/Library/Frameworks/JavaVM.framework";
-#else
     jh = getenv("JAVA_HOME");
+#if defined(__APPLE__) && defined(__MACH__)
+    if (!jh)
+    {
+        jh = DEFAULT_HOME;
+    }
+    else
+    {
+        if (strlen(jh) > HOME_NAME_LEN 
+            && strcasecmp(jh + strlen(jh) - HOME_NAME_LEN, HOME_NAME) == 0)
+        {
+            char* p = ALLOCA_N(char, strlen(jh) + 8);
+            sprintf(p, "%s/..", jh);
+            jh = p;
+        }
+    }
 #endif
     if (!jh)
     {
+        if (RTEST(ruby_verbose))
+        {
+            fprintf(stderr, "no JAVA_HOME environment\n");
+        }
         return 0;
     }
 #if defined(_WIN32)
@@ -132,6 +153,7 @@ static int load_jvm(char* jvmtype)
     
     jvmdll = rb_funcall(rb_const_get(rb_cObject, rb_intern("DL")), rb_intern("dlopen"), 1, rb_str_new2(libpath));
 
+    /* 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); 
     createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2("JNI_CreateJavaVM"), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
@@ -206,7 +228,6 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
       { "DUMMY", NULL },   /* for classpath count */
     };
     char* newpath;
-    VALUE ptr;
     int len;
     int result;
     GETDEFAULTJAVAVMINITARGS initargs;
@@ -218,7 +239,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
 
     if (!RTEST(jvmdll))
     {
-	if (!load_jvm(JVM_TYPE))
+	if (!load_jvm(JVM_TYPE) && !load_jvm(ALT_JVM_TYPE))
 	{
 	    return -1;
 	}
@@ -281,6 +302,10 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     if (!result)
     {
 	result = load_bridge(*pjenv);
+        if (RTEST(ruby_verbose) && result < 0)
+        {
+            fprintf(stderr, "failed to load the bridge class\n");
+        }
     }
     return result;
 }

data/ext/riconv.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.c 58 2008-01-14 08:25:07Z kuwa1 $
+ * $Id: riconv.c 65 2008-03-26 13:19:29Z arton $
  */
 
 #include "ruby.h"
@@ -30,10 +30,10 @@ static const char* const NL_SJIS_TABLE[] = { "SHIFT_JIS", "SHIFT_JISX0213", "WIN
 
 #if defined HAVE_SETLOCALE
 #include <locale.h>
+#endif
 static const char* const LOCALE_EUC_TABLE[] = { "japanese", "ja_JP.eucJP", "japanese.euc", "ja_JP", "ja_JP.ujis" };
 static const char* const LOCALE_SJIS_TABLE[] = { "japanese.sjis", "ja_JP.SJIS" };
 static const char* const LOCALE_UTF8_TABLE[] = { "ja_JP.UTF-8", "ja_JP.utf8" };
-#endif
 
 #include "riconv.h"
 
@@ -108,7 +108,6 @@ static const char* get_charcode_name()
         setlocale(LC_ALL, ""); //initialize
         result = get_charcode_name_by_locale(setlocale(LC_ALL, NULL));
 #elif defined HAVE_GETENV
-        printf("HAVE_GETENV\n");
         if (result = get_charcode_name_by_locale(getenv("LC_ALL")))
                 ;
         else if (result = get_charcode_name_by_locale(getenv("LC_CTYPE")))

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007 arton
+ * Copyright(c) 2004,2005,2006,2007,2008 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 60 2008-02-21 20:11:37Z arton $
+ * $Id: rjb.c 77 2008-08-14 10:22:35Z arton $
  */
 
-#define RJB_VERSION "1.1.2"
+#define RJB_VERSION "1.1.4"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -28,6 +28,7 @@
 #include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
 #include "riconv.h"
 #include "rjb.h"
+#include "ctype.h"
 
 /*
  * Method Modifier Flag defined in
@@ -41,6 +42,20 @@
 #define ACC_VOLATILE  0x0040
 #define ACC_TRANSIENT  0x0080
 
+#define RJB_FIND_CLASS(var, name)              \
+    var = (*jenv)->FindClass(jenv, name); \
+    rjb_check_exception(jenv, 1)
+#define RJB_HOLD_CLASS(var, name)              \
+    var = (*jenv)->FindClass(jenv, name); \
+    rjb_check_exception(jenv, 1);               \
+    var = (*jenv)->NewGlobalRef(jenv, var)
+#define RJB_LOAD_METHOD(var, obj, name, sig) \
+    var = (*jenv)->GetMethodID(jenv, obj, name, sig); \
+    rjb_check_exception(jenv, 1)
+#define RJB_LOAD_STATIC_METHOD(var, obj, name, sig) \
+    var = (*jenv)->GetStaticMethodID(jenv, obj, name, sig); \
+    rjb_check_exception(jenv, 1)
+
 static void register_class(VALUE, VALUE);
 static VALUE import_class(JNIEnv* jenv, jclass, VALUE);
 static VALUE register_instance(JNIEnv* jenv, struct jvi_data*, jobject);
@@ -101,7 +116,7 @@ enum PrimitiveType {
     PRM_SHORT,
     PRM_BYTE,
     PRM_FLOAT,
-    //
+    /* */
     PRM_LAST
 };
 
@@ -126,7 +141,6 @@ JNIEnv* rjb_attach_current_thread(void)
   return env;
 }
 
-
 void rjb_release_string(JNIEnv *jenv, jstring str, const char* chrs)
 {
     (*jenv)->ReleaseStringUTFChars(jenv, str, chrs);
@@ -146,6 +160,7 @@ static char* java2jniname(char* jnicls)
     return jnicls;
 }
 
+#if 0
 static char* jni2javaname(char* jnicls)
 {
     char* p;
@@ -158,6 +173,7 @@ static char* jni2javaname(char* jnicls)
     }
     return jnicls;
 }
+#endif
 
 static char* next_sig(char* p)
 {
@@ -240,7 +256,7 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
     VALUE clsname;
     VALUE v;
     struct jv_data* ptr;
-    // object to ruby
+    /* object to ruby */
     if (!val.l) return Qnil;
     klass = (*jenv)->GetObjectClass(jenv, val.l);
 
@@ -518,7 +534,7 @@ static jprimitive_table jpcvt[] = {
     { "java/lang/Double", "doubleValue", "()D", "(D)V", NULL, 0, 0, jdouble2rv, },
     { "java/lang/Boolean", "booleanValue", "()Z", "(Z)Ljava/lang/Boolean;",
       NULL, 0, 0, jboolean2rv, },
-    { "java/lang/Character", "charValue", "()C", NULL, NULL, 0, 0, jint2rv, },
+    { "java/lang/Character", "charValue", "()C", NULL, NULL, 0, 0, jchar2rv, },
     { "java/lang/Short", "intValue", "()I", NULL, NULL, 0, 0, jint2rv, },
     { "java/lang/Byte", "intValue", "()I", NULL, NULL, 0, 0, jint2rv, },
     { "java/lang/Float", "doubleValue", "()D", NULL, NULL, 0, 0, jdouble2rv, },        
@@ -702,7 +718,7 @@ static void rv2jstring(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 		Data_Get_Struct(val, struct jvi_data, ptr);
 		if ((*jenv)->IsInstanceOf(jenv, ptr->obj, j_string))
 		{
-		    return; // never delete at this time
+		    return; /* never delete at this time */
 		}
 	    }
 	}
@@ -726,7 +742,7 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 	}
 	else if (NIL_P(val))
 	{
-	    // no-op
+	    /* no-op */
 	}
 	else if (FIXNUM_P(val))
 	{
@@ -752,7 +768,7 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 	    case T_DATA:
 	        if (RBASIC(val)->klass == rjbi || RBASIC(val)->klass == rjb)
 		{
-		    // TODO: check instanceof (class (in psig) )
+		    /* TODO: check instanceof (class (in psig) ) */
 		    struct jvi_data* ptr;
 		    Data_Get_Struct(val, struct jvi_data, ptr);
 		    jv->l = ptr->obj;
@@ -813,7 +829,7 @@ static void check_fixnumarray(VALUE v)
     int i;
     int len = RARRAY_LEN(v);
     VALUE* p = RARRAY_PTR(v);
-    // check all fixnum (overflow is permit)
+    /* check all fixnum (overflow is permit) */
     for (i = 0; i < len; i++)
     {
 	if (!FIXNUM_P(*p++))
@@ -830,7 +846,7 @@ static jarray r2barray(JNIEnv* jenv, VALUE v, const char* cls)
     {
 	ary = (*jenv)->NewByteArray(jenv, RSTRING_LEN(v));
 	(*jenv)->SetByteArrayRegion(jenv, ary, 0, RSTRING_LEN(v),
-				    RSTRING_PTR(v));
+				    (const jbyte*)RSTRING_PTR(v));
     }
     else if (TYPE(v) == T_ARRAY)
     {
@@ -1080,7 +1096,7 @@ static void rv2jarray(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
         jarray ja = NULL;
 	if (NIL_P(val))
 	{
-	    // no-op, null for an array
+	    /* no-op, null for an array */
 	}
         else if (*(psig + 1) == '[')
         {
@@ -1179,7 +1195,7 @@ static J2R get_arrayconv(const char* cname, char* pdepth)
             return jcvt[i].ja2r;
         }
     }
-    return jarray2rv;
+    return &jarray2rv;
 }
 
 static J2R get_j2r(JNIEnv* jenv, jobject cls, char* psig, char* pdepth, char* ppsig, off_t* piv, int static_method)
@@ -1334,7 +1350,6 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
 {
     struct cls_method* result;
     struct cls_method* pm;    
-    char* param = NULL;
     const char* jname;
     jstring nm;
     jobjectArray parama;
@@ -1363,7 +1378,7 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
     (*jenv)->DeleteLocalRef(jenv, cls);
     result->static_method = static_method;
     register_methodinfo(result, tbl);
-    // create method alias
+    /* create method alias */
     pm = NULL;
     if (strlen(rname) > 3
         && (*rname == 'g' || *rname == 's') && *(rname + 1) == 'e' && *(rname + 2) == 't')
@@ -1410,7 +1425,6 @@ static void create_fieldinfo(JNIEnv* jenv, st_table* tbl, jobject f, int readonl
     jobject cls;
     char sigs[256];
     off_t iv = 0;
-    char sig = 0;
 
     result = ALLOC(struct cls_field);
     memset(result, 0, sizeof(struct cls_field));
@@ -1526,7 +1540,7 @@ static void load_constants(JNIEnv* jenv, jclass klass, VALUE self, jobjectArray
 	    char sigs[256];
             char* pname;
 
-	    // constants make define directly in the ruby object
+	    /* constants make define directly in the ruby object */
 	    cls = (*jenv)->CallObjectMethod(jenv, f, field_getType);
 	    rjb_check_exception(jenv, 0);
 	    iv = 0;
@@ -1674,67 +1688,44 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
         main_jenv = jenv;
     }
 
-    jconstructor = (*jenv)->FindClass(jenv, "java/lang/reflect/Constructor");
-    rjb_check_exception(jenv, 1);
-    ctrGetParameterTypes = (*jenv)->GetMethodID(jenv, jconstructor, "getParameterTypes", "()[Ljava/lang/Class;");
-    rjb_check_exception(jenv, 1);
-    jmethod = (*jenv)->FindClass(jenv, "java/lang/reflect/Method");
-    method_getModifiers = (*jenv)->GetMethodID(jenv, jmethod, "getModifiers", "()I");
-    rjb_check_exception(jenv, 1);
-    method_getName = (*jenv)->GetMethodID(jenv, jmethod, "getName", "()Ljava/lang/String;");
-    rjb_check_exception(jenv, 1);	
-    getParameterTypes = (*jenv)->GetMethodID(jenv, jmethod, "getParameterTypes", "()[Ljava/lang/Class;");
-    rjb_check_exception(jenv, 1);	
-    getReturnType = (*jenv)->GetMethodID(jenv, jmethod, "getReturnType", "()Ljava/lang/Class;");
-    rjb_check_exception(jenv, 1);
+    RJB_FIND_CLASS(jconstructor, "java/lang/reflect/Constructor");
+    RJB_LOAD_METHOD(ctrGetParameterTypes, jconstructor, "getParameterTypes", "()[Ljava/lang/Class;");
+    RJB_FIND_CLASS(jmethod, "java/lang/reflect/Method");
+    RJB_LOAD_METHOD(method_getModifiers, jmethod, "getModifiers", "()I");
+    RJB_LOAD_METHOD(method_getName, jmethod, "getName", "()Ljava/lang/String;");
+    RJB_LOAD_METHOD(getParameterTypes, jmethod, "getParameterTypes", "()[Ljava/lang/Class;");
+    RJB_LOAD_METHOD(getReturnType, jmethod, "getReturnType", "()Ljava/lang/Class;");
 
-    jfield = (*jenv)->FindClass(jenv, "java/lang/reflect/Field");
-    field_getModifiers = (*jenv)->GetMethodID(jenv, jfield, "getModifiers", "()I");
-    rjb_check_exception(jenv, 1);
-    field_getName = (*jenv)->GetMethodID(jenv, jfield, "getName", "()Ljava/lang/String;");
-    rjb_check_exception(jenv, 1);	
-    field_getType = (*jenv)->GetMethodID(jenv, jfield, "getType", "()Ljava/lang/Class;");
-    rjb_check_exception(jenv, 1);	
+    RJB_FIND_CLASS(jfield, "java/lang/reflect/Field");
+    RJB_LOAD_METHOD(field_getModifiers, jfield, "getModifiers", "()I");
+    RJB_LOAD_METHOD(field_getName, jfield, "getName", "()Ljava/lang/String;");
+    RJB_LOAD_METHOD(field_getType, jfield, "getType", "()Ljava/lang/Class;");
 
-    j_class = (*jenv)->FindClass(jenv, "java/lang/Class");
-    rjb_check_exception(jenv, 1);
-    rjb_class_getName = (*jenv)->GetMethodID(jenv, j_class, "getName", "()Ljava/lang/String;");
-    rjb_check_exception(jenv, 1);
-    j_class = (*jenv)->NewGlobalRef(jenv, j_class);
+    RJB_HOLD_CLASS(j_class, "java/lang/Class");
+    RJB_LOAD_METHOD(rjb_class_getName, j_class, "getName", "()Ljava/lang/String;");
 
-    rjb_j_throwable = (*jenv)->FindClass(jenv, "java/lang/Throwable");
-    rjb_check_exception(jenv, 1);
-    rjb_throwable_getMessage = (*jenv)->GetMethodID(jenv, rjb_j_throwable, "getMessage", "()Ljava/lang/String;");
-    rjb_check_exception(jenv, 1);
+    RJB_HOLD_CLASS(rjb_j_throwable, "java/lang/Throwable");
+    RJB_LOAD_METHOD(rjb_throwable_getMessage, rjb_j_throwable, "getMessage", "()Ljava/lang/String;");
 
-    j_string = (*jenv)->FindClass(jenv, "java/lang/String");
-    rjb_check_exception(jenv, 1);
-    str_tostring = (*jenv)->GetMethodID(jenv, j_string, "toString", "()Ljava/lang/String;");
-    rjb_check_exception(jenv, 1);
-    j_string = (*jenv)->NewGlobalRef(jenv, j_string);
+    RJB_HOLD_CLASS(j_string, "java/lang/String");
+    RJB_LOAD_METHOD(str_tostring, j_string, "toString", "()Ljava/lang/String;");
 
-    j_object = (*jenv)->FindClass(jenv, "java/lang/Object");
-    rjb_check_exception(jenv, 1);
-    j_object = (*jenv)->NewGlobalRef(jenv, j_object);
+    RJB_HOLD_CLASS(j_object, "java/lang/Object");
 
     for (i = PRM_INT; i < PRM_LAST; i++)
     {
 	jclass klass = (*jenv)->FindClass(jenv, jpcvt[i].classname);
 	if (i == PRM_BOOLEAN)
 	{
-	    jpcvt[i].ctr_id = (*jenv)->GetStaticMethodID(jenv,
-			 klass, "valueOf", jpcvt[i].ctrsig);
-	    rjb_check_exception(jenv, 1);
+            RJB_LOAD_STATIC_METHOD(jpcvt[i].ctr_id, klass, "valueOf", jpcvt[i].ctrsig);
 	}
 	else if (jpcvt[i].ctrsig)
 	{
-	    jpcvt[i].ctr_id = (*jenv)->GetMethodID(jenv, klass,
-						   "<init>", jpcvt[i].ctrsig);
-	    rjb_check_exception(jenv, 1);
+            RJB_LOAD_METHOD(jpcvt[i].ctr_id, klass, "<init>", jpcvt[i].ctrsig);
 	}
-	jpcvt[i].to_prim_id = (*jenv)->GetMethodID(jenv, klass,
+        RJB_LOAD_METHOD(jpcvt[i].to_prim_id, klass,
 				   jpcvt[i].to_prim_method, jpcvt[i].prmsig);
-	rjb_check_exception(jenv, 1);
+
         jpcvt[i].klass = (*jenv)->NewGlobalRef(jenv, klass);
     }
 
@@ -1745,6 +1736,17 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
     return Qnil;
 }
 
+/*
+ * load Java Virtual Machine with default arguments.
+ */
+VALUE rjb_load_vm_default()
+{
+    if (rjb_jvm) return Qfalse;
+
+    rb_warning("Rjb::implicit jvm loading");
+    return rjb_s_load(0, NULL, 0);
+}
+
 /*
  * unload Java Virtual Machine
  *
@@ -1759,13 +1761,16 @@ static int clear_classes(VALUE key, VALUE val, VALUE dummy)
 }
 static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
 {
+    int result = 0;
     st_foreach(RHASH_TBL(rjb_loaded_classes), clear_classes, 0);
     if (rjb_jvm)
     {
-	(*rjb_jvm)->DestroyJavaVM(rjb_jvm);
-	rjb_jvm = NULL;
+        JNIEnv* jenv = rjb_attach_current_thread();
+        (*jenv)->ExceptionClear(jenv);
+        result = (*rjb_jvm)->DestroyJavaVM(rjb_jvm);
+        rjb_jvm = NULL;
     }
-    return Qnil;
+    return INT2NUM(result);
 }
 
 /*
@@ -1799,6 +1804,7 @@ static VALUE rjb_s_get_pconversion(VALUE self)
 /*
  * free java class
  */
+#if 0
 static void free_constructor(struct cls_constructor* p)
 {
     free(p->arg_convert);
@@ -1812,6 +1818,7 @@ static int free_method_item(ID key, struct cls_method* pm, int dummy)
     }
     return ST_CONTINUE;
 }
+#endif
 
 /*
  * finalize Object instance
@@ -1987,7 +1994,7 @@ static int check_rtype(JNIEnv* jenv, VALUE v, char* p)
     case T_DATA:
         if (RBASIC(v)->klass == rjbi && pcls)
 	{
-	    // imported object
+	    /* imported object */
 	    jclass cls;
             struct jvi_data* ptr;
 	    int result = 0;
@@ -2001,9 +2008,9 @@ static int check_rtype(JNIEnv* jenv, VALUE v, char* p)
 	    }
 	    return result;
 	}
-	// fall down to the next case 
+	/* fall down to the next case */
     case T_OBJECT:
-	// fall down to the next case
+	/* fall down to the next case */
     default:
         if (pcls || *p == '[')
         {
@@ -2022,8 +2029,12 @@ static VALUE rjb_newinstance_s(int argc, VALUE* argv, VALUE self)
     char* sig;
     VALUE ret = Qnil;
     struct jv_data* ptr;
-    JNIEnv* jenv = rjb_attach_current_thread();
     int found = 0;
+    JNIEnv* jenv = NULL;
+
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
 
     rb_scan_args(argc, argv, "1*", &vsig, &rest);
     sig = StringValueCStr(vsig);
@@ -2053,8 +2064,12 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
     VALUE ret = Qnil;
     struct jv_data* ptr;
     struct cls_constructor** pc;
-    JNIEnv* jenv = rjb_attach_current_thread();
     int found = 0;
+    JNIEnv* jenv = NULL;
+    
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
 
     Data_Get_Struct(self, struct jv_data, ptr);
 
@@ -2111,9 +2126,13 @@ jclass rjb_find_class(JNIEnv* jenv, VALUE name)
 static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
 {
     VALUE result = Qnil;
-    JNIEnv* jenv = rjb_attach_current_thread();
+    JNIEnv* jenv = NULL;
+    jclass itf;
     
-    jclass itf = rjb_find_class(jenv, itfname); 
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
+    itf = rjb_find_class(jenv, itfname); 
     rjb_check_exception(jenv, 1);
     if (itf)
     {
@@ -2137,6 +2156,18 @@ static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
     return result;
 }
 
+/*
+ * jclass Rjb::bind(rbobj, interface_name)
+ */
+static VALUE rjb_s_unbind(VALUE self, VALUE rbobj)
+{
+    JNIEnv* jenv;
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
+    return rb_ary_delete(proxies, rbobj);
+}
+
 /*
  * Jclass Rjb::import(classname)
  */
@@ -2150,12 +2181,9 @@ static VALUE rjb_s_import(VALUE self, VALUE clsname)
 	return v;
     }
 
-    if (!rjb_jvm) 
-    {
-        /* auto-load with default setting */
-        rjb_s_load(0, NULL, 0);
-    }
+    rjb_load_vm_default();
     jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
     jcls = rjb_find_class(jenv, clsname);
     if (!jcls)
     {
@@ -2439,7 +2467,7 @@ static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
     }
     if (!found)
     {
-	char* tname = rb_id2name(orgpm->name);
+	const char* tname = rb_id2name(orgpm->name);
 	if (sig) 
 	{
 	    rb_raise(rb_eRuntimeError, "Fail: unknown method name `%s(\'%s\')'", tname, sig);
@@ -2528,7 +2556,7 @@ static VALUE invoke_by_instance(ID rmid, int argc, VALUE* argv,
     JNIEnv* jenv = rjb_attach_current_thread();
     struct cls_field* pf;
     struct cls_method* pm;
-    char* tname = rb_id2name(rmid);
+    const char* tname = rb_id2name(rmid);
     
     if (argc == 0 && st_lookup(ptr->fields, rmid, (st_data_t*)&pf))
     {
@@ -2546,7 +2574,7 @@ static VALUE invoke_by_instance(ID rmid, int argc, VALUE* argv,
                 setter(jenv, pf, ptr, *argv);
                 return ret;
             }
-            // fall through for the setter alias name
+            /* fall through for the setter alias name */
         }
         if (st_lookup(ptr->methods, rmid, (st_data_t*)&pm))
         {
@@ -2594,7 +2622,7 @@ static VALUE invoke_by_class(ID rmid, int argc, VALUE* argv,
     struct jv_data* clsptr;
     struct cls_field* pf;
     struct cls_method* pm;
-    char* tname = rb_id2name(rmid);
+    const char* tname = rb_id2name(rmid);
     JNIEnv* jenv = rjb_attach_current_thread();
 
     Data_Get_Struct(jklass, struct jv_data, clsptr);
@@ -2671,7 +2699,7 @@ static VALUE rjb_missing(int argc, VALUE* argv, VALUE self)
 {
     struct jv_data* ptr;
     ID rmid = rb_to_id(argv[0]);
-    char* rmname = rb_id2name(rmid);
+    const char* rmname = rb_id2name(rmid);
     if (isupper(*rmname))
     {
         VALUE r, args[2];
@@ -2725,6 +2753,7 @@ void Init_rjbcore()
     rb_define_module_function(rjb, "unload", rjb_s_unload, -1);
     rb_define_module_function(rjb, "import", rjb_s_import, 1);
     rb_define_module_function(rjb, "bind", rjb_s_bind, 2);
+    rb_define_module_function(rjb, "unbind", rjb_s_unbind, 1);
     rb_define_module_function(rjb, "classes", rjb_s_classes, 0);
     rb_define_module_function(rjb, "throw", rjb_s_throw, -1);
     rb_define_module_function(rjb, "primitive_conversion=", rjb_s_set_pconversion, 1);
@@ -2802,7 +2831,7 @@ JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
             *(argv + 2) = argc - 3;
             result = rb_protect(safe_funcall, (VALUE)argv, &sstat);
 	    rv2jobject(jenv, result, &j, NULL, 0);
-	    // I can't delete this object...
+	    /* 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 53 2008-01-09 11:13:33Z arton $
+ * $Id: rjb.h 64 2008-03-05 14:24:22Z kuwa1 $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision
@@ -68,6 +68,7 @@ extern jmethodID rjb_throwable_getMessage;
 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();
 
 /* in rjbexception.c */
 extern VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str);

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 47 2007-12-28 06:39:43Z arton $
+ * $Id: rjbexception.c 75 2008-08-14 10:03:52Z arton $
  */
 
 #include "ruby.h"
@@ -66,7 +66,13 @@ VALUE rjb_s_throw(int argc, VALUE* argv, VALUE self)
 {
     VALUE klass;
     VALUE message;
-    JNIEnv* jenv = rjb_attach_current_thread();
+    JNIEnv* jenv = NULL; 
+
+    rjb_load_vm_default();
+
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
+
     if (rb_scan_args(argc, argv, "11", &klass, &message) == 2)
     {
         jclass excep = rjb_find_class(jenv, klass);
@@ -103,7 +109,6 @@ void rjb_check_exception(JNIEnv* jenv, int t)
 	    (*jenv)->ExceptionDescribe(jenv);
 	}
 	(*jenv)->ExceptionClear(jenv);
-//        if (t)
         if(1)
 	{
  	    char* msg = "unknown exception";

data/test/test.rb

@@ -1,8 +1,13 @@
 #!/usr/local/env ruby
-# $Id: test.rb 58 2008-01-14 08:25:07Z kuwa1 $
+# $Id: test.rb 70 2008-05-26 12:31:35Z arton $
 
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
 require 'test/unit'
-require 'rjb'
 
 puts "start RJB(#{Rjb::VERSION}) test"
 class TestRjb < Test::Unit::TestCase
@@ -22,8 +27,7 @@ class TestRjb < Test::Unit::TestCase
     @jChar = Rjb::import('java.lang.Character')
   end
 
-  def tearDown
-    unload
+  def teardown
   end
 
   def test_metaclass
@@ -226,6 +230,12 @@ class TestRjb < Test::Unit::TestCase
     assert("43210", a.concat(it))
   end
 
+  def test_unbind()
+    it = TestIter.new
+    it = bind(it, 'java.util.Iterator')
+    assert(it, unbind(it))
+  end
+
   class TestComparator
     def compare(o1, o2)
       o1.to_i - o2.to_i
@@ -330,13 +340,46 @@ class TestRjb < Test::Unit::TestCase
     end
   end
 
+  def test_throw_clear()
+    assert_nothing_raised {
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      test = import('jp.co.infoseek.hp.arton.rjb.Test')
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      test.new
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      @jString.new_with_sig('Ljava.lang.String;', "abcde")
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      it = TestIterator.new(0)
+      it = bind(it, 'java.util.Iterator')
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue NoSuchElementException
+      end
+      begin
+	Rjb::throw('java.lang.IllegalAccessException', 'test exception')
+      rescue IllegalAccessException
+      end
+      unbind(it)
+    }
+  end
+
   def test_field()
-    point = import('java.awt.Point')
-    pnt = point.new(11, 13)
-    assert_equal(11, pnt.x)
-    assert_equal(13, pnt.y)
-    pnt.x = 32
-    assert_equal(32, pnt.x)
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    assert_equal('Hello World !!', test.helloData)
+    test.helloData = 'Goodby World !'
+    assert_equal('Goodby World !', test.helloData)
   end
 
   def test_instancemethod_from_class()
@@ -572,5 +615,16 @@ class TestRjb < Test::Unit::TestCase
     assert_equal "\0\x1\x2\x3\x4", map.get('abc')
     assert_equal "\x5\x6\x7\x8\x9", map.get('def')
   end
+
+  def x_test_zzunload
+    # this test should run at the last
+    unload
+    begin
+      load('.')
+      fail 'no exception'
+    rescue
+      assert_equal "can't create Java VM", $!.message
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.4
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-22 00:00:00 +09:00
+date: 2008-08-14 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -25,24 +25,24 @@ files:
 - ext/RBridge.java
 - ext/load.c
 - ext/riconv.c
-- ext/rjb.c
 - ext/rjbexception.c
-- ext/extconf.h
+- ext/rjb.c
 - ext/jniwrap.h
-- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/riconv.h
 - ext/rjb.h
+- ext/riconv.h
+- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
+- ext/extconf.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
-- test/gctest.rb
 - test/test.rb
-- test/jp/co/infoseek/hp/arton/rjb/Base.class
+- test/gctest.rb
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
+- test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
-- test/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - COPYING
 - ChangeLog
 - readme.sj
@@ -72,7 +72,7 @@ requirements:
 - JDK 5.0
 - " VC6 version of Ruby"
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby Java bridge