From d78bf6c0ec1be859d7ae3e9e97b5707558a207ad Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 22 Nov 2008 12:11:36 +0000
Subject: merges r20257 from trunk into ruby_1_9_1. fixed NoMethodError problem
 from NaHi [ruby-dev:37110].

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 lib/drb/drb.rb | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 182f340ab..bb3d1feef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 19 01:10:52 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
+	  from NaHi [ruby-dev:37110].
+
 Wed Nov 19 01:05:26 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* cont.c (cont_mark, cont_capture, cont_restore_1): speed up
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 0e6212838..13a89de07 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1208,6 +1208,7 @@ module DRb
     end
 
     def alive?  # :nodoc:
+      return false unless @protocol
       @protocol.alive?
     end
   end
-- 
cgit