keiju	2010-04-22 21:54:18 +0900 (Thu, 22 Apr 2010)

  New Revision: 27444

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

  Log:
    * lib/irb/ext/multi-irb.rb: fix multi-irb running
       parallelly. [ruby-dev:41031] [Bug #3182]

  Modified files:
    trunk/ChangeLog
    trunk/lib/irb/ext/multi-irb.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27443)
+++ ChangeLog	(revision 27444)
@@ -1,3 +1,8 @@
+Thu Apr 22 21:50:17 2010  Keiju Ishitsuka  <keiju@r...>
+
+	* lib/irb/ext/multi-irb.rb: fix multi-irb running
+	  parallelly. [ruby-dev:41031] [Bug #3182]
+
 Thu Apr 22 17:13:34 2010  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems: Import RubyGems 1.3.7.pre.1 (as 1.3.6.1).
Index: lib/irb/ext/multi-irb.rb
===================================================================
--- lib/irb/ext/multi-irb.rb	(revision 27443)
+++ lib/irb/ext/multi-irb.rb	(revision 27444)
@@ -172,12 +172,14 @@
       ensure
 	unless system_exit
 	  @JobManager.delete(irb)
-	  if parent_thread.alive?
-	    @JobManager.current_job = @JobManager.irb(parent_thread)
-	    parent_thread.run
-	  else
-	    @JobManager.current_job = @JobManager.main_irb
-	    @JobManager.main_thread.run
+	  if @JobManager.current_job == irb
+	    if parent_thread.alive?
+	      @JobManager.current_job = @JobManager.irb(parent_thread)
+	      parent_thread.run
+	    else
+	      @JobManager.current_job = @JobManager.main_irb
+	      @JobManager.main_thread.run
+	    end
 	  end
 	end
       end

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