From 2e6be337feb6caafb9546fc7d52496e7aedfe4f0 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 16 Feb 2009 13:37:06 +0000 Subject: 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 --- ChangeLog | 5 +++++ lib/drb/drb.rb | 1 + version.h | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7c36ea78e..5b7a0e4aa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 16 22:36:37 2009 Masatoshi SEKI + + * lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem + from NaHi [ruby-dev:37110]. + Sun Feb 15 04:21:42 2009 Yukihiro Matsumoto * lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete. 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 diff --git a/version.h b/version.h index eaebd46f9f..11f7c3f3c5 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-02-15" +#define RUBY_RELEASE_DATE "2009-02-16" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090215 -#define RUBY_PATCHLEVEL 118 +#define RUBY_RELEASE_CODE 20090216 +#define RUBY_PATCHLEVEL 119 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #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[]; -- cgit v1.2.3