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_7@22345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 20e658e611..7dd0f01e76 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