summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-18 16:24:22 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-18 16:24:22 +0000
commitc344b6316c549d0ebf21e0717a260a0db3dfde0c (patch)
tree3279e35baad9c07470dc9fec57383e566cafa7d0
parent98e81ba27140ce4f190a7f83cfc76a5d0179e43a (diff)
downloadruby-c344b6316c549d0ebf21e0717a260a0db3dfde0c.tar.gz
ruby-c344b6316c549d0ebf21e0717a260a0db3dfde0c.tar.xz
ruby-c344b6316c549d0ebf21e0717a260a0db3dfde0c.zip
fixed NoMethodError problem from NaHi [ruby-dev:37110].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/drb/drb.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dd3253a9a..0dc77ee65 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