Project: RJB

Revision: 73

Author: arton

Date: 22 Jun 2008 10:27:36

• /trunk/ext/rjb.c

  ......	@@ -1192,7 +1192,7 @@
  1192	1192	return jcvt[i].ja2r;
  1193	1193	}
  1194	1194	}
  1195		return jarray2rv;
  	1195	return &jarray2rv;
  1196	1196	}
  1197	1197
  1198	1198	static J2R get_j2r(JNIEnv* jenv, jobject cls, char* psig, char* pdepth, char* ppsig, off_t* piv, int static_method)
  ......	@@ -1757,8 +1757,8 @@
  1757	1757	}
  1758	1758	static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
  1759	1759	{
  1760		st_foreach(RHASH_TBL(rjb_loaded_classes), clear_classes, 0);
  1761	1760	int result = 0;
  	1761	st_foreach(RHASH_TBL(rjb_loaded_classes), clear_classes, 0);
  1762	1762	if (rjb_jvm)
  1763	1763	{
  1764	1764	JNIEnv* jenv = rjb_attach_current_thread();
  ......	@@ -2121,11 +2121,12 @@
  2121	2121	{
  2122	2122	VALUE result = Qnil;
  2123	2123	JNIEnv* jenv = NULL;
  2124
  	2124	jclass itf;
  	2125
  2125	2126	rjb_load_vm_default();
  2126	2127	jenv = rjb_attach_current_thread();
  2127	2128	(*jenv)->ExceptionClear(jenv);
  2128		jclass itf = rjb_find_class(jenv, itfname);
  	2129	itf = rjb_find_class(jenv, itfname);
  2129	2130	rjb_check_exception(jenv, 1);
  2130	2131	if (itf)
  2131	2132	{
  ......	@@ -2460,7 +2461,7 @@
  2460	2461	}
  2461	2462	if (!found)
  2462	2463	{
  2463		char* tname = rb_id2name(orgpm->name);
  	2464	const char* tname = rb_id2name(orgpm->name);
  2464	2465	if (sig)
  2465	2466	{
  2466	2467	rb_raise(rb_eRuntimeError, "Fail: unknown method name `%s(\'%s\')'", tname, sig);
  ......	@@ -2549,7 +2550,7 @@
  2549	2550	JNIEnv* jenv = rjb_attach_current_thread();
  2550	2551	struct cls_field* pf;
  2551	2552	struct cls_method* pm;
  2552		char* tname = rb_id2name(rmid);
  	2553	const char* tname = rb_id2name(rmid);
  2553	2554
  2554	2555	if (argc == 0 && st_lookup(ptr->fields, rmid, (st_data_t*)&pf))
  2555	2556	{
  ......	@@ -2615,7 +2616,7 @@
  2615	2616	struct jv_data* clsptr;
  2616	2617	struct cls_field* pf;
  2617	2618	struct cls_method* pm;
  2618		char* tname = rb_id2name(rmid);
  	2619	const char* tname = rb_id2name(rmid);
  2619	2620	JNIEnv* jenv = rjb_attach_current_thread();
  2620	2621
  2621	2622	Data_Get_Struct(jklass, struct jv_data, clsptr);
  ......	@@ -2692,7 +2693,7 @@
  2692	2693	{
  2693	2694	struct jv_data* ptr;
  2694	2695	ID rmid = rb_to_id(argv[0]);
  2695		char* rmname = rb_id2name(rmid);
  	2696	const char* rmname = rb_id2name(rmid);
  2696	2697	if (isupper(*rmname))
  2697	2698	{
  2698	2699	VALUE r, args[2];