rjb 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b0f2af57eaee97970ba6fc2edcf52b284e4b609f984e51be36affb6be3f185
-  data.tar.gz: 76bbbcb0d8442a1c64ca5532f0b9678c2ed54537bc75a58e1b1ae3d996d07f6e
+  metadata.gz: 4a44bbac6e23b95fd5b2297053622034f4cc8027d656f546bce3d3d2e20646b4
+  data.tar.gz: 83ff490b4dd8fe79954832e355e4981e5dea72cf3dfbd8350698f869a7ca5eae
 SHA512:
-  metadata.gz: 04f3b57c9041ee7862723ec31e86950b597611e334473c387b97a647478d6e170f099be3ab72fb3c8739950b4b49b1355d78922d426e04e73f7800e17949fb1c
-  data.tar.gz: d3fa29ac0db4648212cef20077974a4167b217c7c7e044e928dae03570a2a456a1325561948d768bc3b52454cd73747db76f7387670deb766d59cb1c70913927
+  metadata.gz: 9e63eb18a2302be1b83db2e10486104dd5380cbcb7d623c2a2eb6a6203de21f750c03a26c7e6bbd6002adca588ca6d475a12368d72d5790fd6052738770c3ce8
+  data.tar.gz: 426214a2feae8412362efaabb2cf0c4a49882e5701d0dceb80cb91ea24dc686eebc6c9fdee81a216e692735a86d33c99bc72bf9efaae6b0d631e43f4fa9a4b27

data/ChangeLog

@@ -1,3 +1,8 @@
+Fri Dec 28 2018 arton
+ * ext/rjbexception.c
+	fix #60; stable java derived exception class for raise
+ * ext/rjb.c
+	RJB_VERSION -> 1.5.7
 Thu Dec 27 2018 sean-npu
  * ext/load.c
 	support aarch64

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014-2016 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014-2016,2018 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
  *
  */
 
-#define RJB_VERSION "1.5.6"
+#define RJB_VERSION "1.5.7"
 
 #include "ruby.h"
 #include "extconf.h"

data/ext/rjbexception.c

@@ -26,21 +26,9 @@
 #include "riconv.h"
 #include "rjb.h"
 
-static VALUE missing_delegate(int argc, VALUE* argv, VALUE self)
-{
-    ID rmid = rb_to_id(argv[0]);
-    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
-}
-
 static VALUE get_cause(VALUE self)
 {
-  return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rb_intern("cause"), 0);
-}
-
-static VALUE exception_to_s(VALUE self)
-{
-    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")),
-                      rb_intern("toString"), 0);
+    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rb_intern("cause"), 0);
 }
 
 /*
@@ -70,18 +58,16 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     rexp = rb_hash_aref(rjb_loaded_classes, cname);
     if (rexp == Qnil)
     {
-	rexp = rb_define_class(pcls, rb_eStandardError);
-	rb_define_method(rexp, "cause", get_cause, 0);
-        rb_define_method(rexp, "method_missing", missing_delegate, -1);
-        rb_define_method(rexp, "to_str", exception_to_s, 0);
+        rexp = rb_define_class(pcls, rb_eStandardError);
+        rb_define_method(rexp, "cause", get_cause, 0);
 #if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)
 	rb_hash_aset(rjb_loaded_classes, cname, rexp);
 #else
-#ifdef RHASH_TBL
-    st_insert(RHASH_TBL(rjb_loaded_classes), cname, rexp);
-#else
-    st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
-#endif
+  #ifdef RHASH_TBL
+        st_insert(RHASH_TBL(rjb_loaded_classes), cname, rexp);
+  #else
+        st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
+  #endif
 #endif
 	
     }
@@ -140,7 +126,7 @@ void rjb_check_exception(JNIEnv* jenv, int t)
 	(*jenv)->ExceptionClear(jenv);
         if(1)
 	{
- 	    char* msg = "unknown exception";
+            char* msg = (char*)"unknown exception";
 	    jclass cls = (*jenv)->GetObjectClass(jenv, exp);
  	    jstring str = (*jenv)->CallObjectMethod(jenv, exp, rjb_throwable_getMessage);
 	    if (str)

data/test/anon-test-50.rb

@@ -0,0 +1,13 @@
+require 'rjb'
+Rjb::load
+begin
+  Rjb::throw('java.lang.NumberFormatException', 'test')
+  Rjb::throw(Rjb::import('java.lang.NumberFormatException').new('test'))
+rescue NumberFormatException => e
+  puts "I expect a NumberFormatException to be thrown"
+rescue Exception => e
+  puts "I at least expect *some* excetpion to be thrown"
+else
+  puts "Unexpectedly no exception is thrown"
+end
+

data/test/anon-test-60.rb

@@ -0,0 +1,17 @@
+require 'rjb'
+Rjb::load
+begin
+  Rjb::import('java.lang.Integer').parseInt('x')
+rescue => e
+  begin
+    raise e
+  rescue => f
+    if e.class == f.class
+      puts "I expect the equality to be true"
+    else
+      puts "Unexpectedly the re-raised Java exception has changed " +
+           "from a #{e.class} into a #{f.class}"
+    end
+  end
+end
+

data/test/anon.rb

@@ -0,0 +1,23 @@
+require 'rjb'
+Rjb::load
+begin
+  Rjb::import('java.lang.Integer').parseInt('x')
+rescue NumberFormatException => e
+  puts e.class
+  puts e.message
+  begin
+    puts (StandardError === e).to_s
+    raise e
+  rescue => f
+    puts f.class
+    puts f.message
+    puts f.cause.inspect
+    puts f.exception.inspect
+    if e.class == f.class
+      puts "I expect the equality to be true"
+    else
+      puts "Unexpectedly the re-raised Java exception has changed " +
+           "from a #{e.class} into a #{f.class}"
+    end
+  end
+end

data/test/b.rb

@@ -0,0 +1,13 @@
+class TestError < StandardError
+end
+
+begin
+  raise TestError.new
+rescue => e
+  puts e.class
+  begin
+    raise e, 'abc'
+  rescue => f
+    puts f.class
+  end
+end

data/test/x.rb

@@ -0,0 +1,10 @@
+begin
+  i.foo
+rescue => e
+  puts e.class
+  begin
+    raise e
+  rescue => f
+    puts f.class
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - arton
@@ -44,6 +44,10 @@ files:
 - readme.txt
 - samples/filechooser.rb
 - samples/unzip.rb
+- test/anon-test-50.rb
+- test/anon-test-60.rb
+- test/anon.rb
+- test/b.rb
 - test/exttest.rb
 - test/gctest.rb
 - test/jartest.jar
@@ -67,6 +71,7 @@ files:
 - test/test_osxjvm.rb
 - test/test_osxload.rb
 - test/test_unload.rb
+- test/x.rb
 homepage: https://www.artonx.org/collabo/backyard/?RubyJavaBridge
 licenses:
 - LGPL