summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-16 13:22:09 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-16 13:22:09 +0000
commita9130b3deb0f4d2d07363d817777c0f1c865defe (patch)
tree3f0cb9d8d5bbe225bacf90750317153e9070a804
parent7cdc932f5a0f4b2d984d6779fc6a255cb3789c49 (diff)
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
-rw-r--r--ChangeLog5
-rw-r--r--lib/drb/drb.rb1
-rw-r--r--version.h8
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 326ed65..047b12f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 16 22:21:20 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
+ from NaHi [ruby-dev:37110].
+
Sun Feb 15 04:18:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 25fbb3f..cec279f 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
diff --git a/version.h b/version.h
index dea1eee..21e40e3 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-02-15"
+#define RUBY_RELEASE_DATE "2009-02-16"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090215
-#define RUBY_PATCHLEVEL 332
+#define RUBY_RELEASE_CODE 20090216
+#define RUBY_PATCHLEVEL 333
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 16
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];