shyouhei	2009-02-16 22:22:09 +0900 (Mon, 16 Feb 2009)

  New Revision: 22343

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22343

  Log:
    merge revision(s) 20252:20255:
    * lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
      from NaHi [ruby-dev:37110].

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/drb/drb.rb
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 22342)
+++ ruby_1_8_6/ChangeLog	(revision 22343)
@@ -1,3 +1,8 @@
+Mon Feb 16 22:21:20 2009  Masatoshi SEKI  <m_seki@m...>
+
+	* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
+	  from NaHi [ruby-dev:37110].
+
 Sun Feb 15 04:18:49 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 22342)
+++ ruby_1_8_6/version.h	(revision 22343)
@@ -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[];
Index: ruby_1_8_6/lib/drb/drb.rb
===================================================================
--- ruby_1_8_6/lib/drb/drb.rb	(revision 22342)
+++ ruby_1_8_6/lib/drb/drb.rb	(revision 22343)
@@ -1201,6 +1201,7 @@
     end
 
     def alive?  # :nodoc:
+      return false unless @protocol
       @protocol.alive?
     end
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/