summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-08 08:52:25 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-08 08:52:25 +0000
commitd11b6f0cfcc676a4315bfad43a83e276a05c83d9 (patch)
tree1b5ac843595ca6102aff5bae5d3fc73e9bb4774e /lib
parent460530eab138a4c959be884fb86c9b3579ba6141 (diff)
* merge -c 12006
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/shell/process-controller.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index f0ddd58a45..573edb6829 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -246,9 +246,11 @@ class Shell
redo
end
Thread.exclusive do
- terminate_job(command)
- @job_condition.signal
- command.notify "job(%id) finish.", @shell.debug?
+ @job_monitor.synchronize do
+ terminate_job(command)
+ @job_condition.signal
+ command.notify "job(%id) finish.", @shell.debug?
+ end
end
end
}