ayumin	2012-02-07 13:59:18 +0900 (Tue, 07 Feb 2012)

  New Revision: 34453

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34453

  Log:
    merge revision(s) 34250:
    
    * gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
      an exception under rb_protect(). [ruby-dev:45113]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/gc.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34452)
+++ ruby_1_9_3/ChangeLog	(revision 34453)
@@ -1,3 +1,8 @@
+Tue Feb  7 13:59:26 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
+	  an exception under rb_protect(). [ruby-dev:45113]
+
 Mon Feb  6 15:34:47 2012  Tanaka Akira  <akr@f...>
 
 	* ruby.c (fill_standard_fds): use fstat() instead of fcntl(F_GETFD)
Index: ruby_1_9_3/gc.c
===================================================================
--- ruby_1_9_3/gc.c	(revision 34452)
+++ ruby_1_9_3/gc.c	(revision 34453)
@@ -2918,7 +2918,10 @@
 	VALUE final = RARRAY_PTR(table)[i];
 	args[0] = RARRAY_PTR(final)[1];
 	args[2] = FIX2INT(RARRAY_PTR(final)[0]);
+	status = 0;
 	rb_protect(run_single_final, (VALUE)args, &status);
+	if (status)
+	    rb_set_errinfo(Qnil);
     }
 }
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34452)
+++ ruby_1_9_3/version.h	(revision 34453)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 46
+#define RUBY_PATCHLEVEL 47
 
 #define RUBY_RELEASE_DATE "2012-02-07"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/