summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-30 13:30:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-30 13:30:19 +0000
commitd70e3f40d7db03ae00c2958e2ae77adb9a24df64 (patch)
tree633c1ba4a3ee2558f77c07dc8ea912987386719c
parentfdd01edf7499082bdf3e85a9ef1284dfff39df60 (diff)
downloadruby-d70e3f40d7db03ae00c2958e2ae77adb9a24df64.tar.gz
ruby-d70e3f40d7db03ae00c2958e2ae77adb9a24df64.tar.xz
ruby-d70e3f40d7db03ae00c2958e2ae77adb9a24df64.zip
* eval.c (rb_trap_eval): make the current thread runnable to deal with
exceptions which occurred within the trap. fixed: [ruby-dev:27729] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e0cf04eb..5a0a789eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 30 22:29:01 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_trap_eval): make the current thread runnable to deal with
+ exceptions which occurred within the trap. fixed: [ruby-dev:27729]
+
Sat Jul 29 06:12:06 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
diff --git a/eval.c b/eval.c
index 3a16c2855..9bc43db6e 100644
--- a/eval.c
+++ b/eval.c
@@ -10041,6 +10041,7 @@ rb_trap_eval(VALUE cmd, int sig, int safe)
if (state) {
rb_trap_immediate = 0;
+ rb_thread_ready(curr_thread);
JUMP_TAG(state);
}