* merge -c 12006

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e8bcc5e0ec..8b53f3e7f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  6 18:58:37 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	
+	* lib/shell/process-controller.rb: fix thread synchronization
+	  problem for [ruby-dev:30477].
+	
 Sun Mar  4 23:53:27 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (mv): could not move a directory between
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
       }
diff --git a/version.h b/version.h
index 0d391a2234..9f72a1d912 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-03-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070308
-#define RUBY_PATCHLEVEL 28
+#define RUBY_PATCHLEVEL 29
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8