yugui	2008-11-22 21:11:36 +0900 (Sat, 22 Nov 2008)

  New Revision: 20308

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

  Log:
    merges r20257 from trunk into ruby_1_9_1.
    fixed NoMethodError problem from NaHi [ruby-dev:37110].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/drb/drb.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20307)
+++ ruby_1_9_1/ChangeLog	(revision 20308)
@@ -1,3 +1,8 @@
+Wed Nov 19 01:10:52 2008  Masatoshi SEKI  <m_seki@m...>
+
+	* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
+	  from NaHi [ruby-dev:37110].
+
 Wed Nov 19 01:05:26 2008  Yusuke Endoh  <mame@t...>
 
 	* cont.c (cont_mark, cont_capture, cont_restore_1): speed up
Index: ruby_1_9_1/lib/drb/drb.rb
===================================================================
--- ruby_1_9_1/lib/drb/drb.rb	(revision 20307)
+++ ruby_1_9_1/lib/drb/drb.rb	(revision 20308)
@@ -1208,6 +1208,7 @@
     end
 
     def alive?  # :nodoc:
+      return false unless @protocol
       @protocol.alive?
     end
   end

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