From a9130b3deb0f4d2d07363d817777c0f1c865defe Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 16 Feb 2009 13:22:09 +0000
Subject: merge revision(s) 20252:20255: 	* lib/drb/drb.rb
 (DRbConn::alive?): fixed NoMethodError problem 	  from NaHi
 [ruby-dev:37110].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/drb/drb.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 25fbb3f788..cec279fd1b 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1201,6 +1201,7 @@ module DRb
     end
 
     def alive?  # :nodoc:
+      return false unless @protocol
       @protocol.alive?
     end
   end
-- 
cgit v1.2.3