summaryrefslogtreecommitdiff
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
commitea899f6b18b63057eafa2bad72de55d40fa4192f (patch)
tree4908e4ee6334c7d917aedc3e31b11093f4118ac5
parentf89633f03d617eff02a44a0be36e2668592c0f5a (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 0089596024..cca6cf7fc6 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 56c96954ac..2917e38c37 100644
--- a/eval.c
+++ b/eval.c
@@ -9939,6 +9939,7 @@ rb_trap_eval(cmd, sig, safe)
if (state) {
rb_trap_immediate = 0;
+ rb_thread_ready(curr_thread);
JUMP_TAG(state);
}