diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-16 13:22:09 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-16 13:22:09 +0000 |
commit | 1a630a462e9e345b2ecea07017ae42c38c3b72c1 (patch) | |
tree | 3f0cb9d8d5bbe225bacf90750317153e9070a804 /lib | |
parent | 7d2a1e59fe57490db83b5f7b80914664e9901a68 (diff) | |
download | ruby-1a630a462e9e345b2ecea07017ae42c38c3b72c1.tar.gz ruby-1a630a462e9e345b2ecea07017ae42c38c3b72c1.tar.xz ruby-1a630a462e9e345b2ecea07017ae42c38c3b72c1.zip |
merge revision(s) 20252:20255:
* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
from NaHi [ruby-dev:37110].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@22343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/drb/drb.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 25fbb3f78..cec279fd1 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 |