diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 12:11:36 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 12:11:36 +0000 |
| commit | d78bf6c0ec1be859d7ae3e9e97b5707558a207ad (patch) | |
| tree | 955986c8dd5a81f850223de624dd0dcf208dae02 | |
| parent | 91e9285f74ee7f2f3822faa226ebd4adf4ce0491 (diff) | |
| download | ruby-d78bf6c0ec1be859d7ae3e9e97b5707558a207ad.tar.gz ruby-d78bf6c0ec1be859d7ae3e9e97b5707558a207ad.tar.xz ruby-d78bf6c0ec1be859d7ae3e9e97b5707558a207ad.zip | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/drb/drb.rb | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -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 |