nagachika	2018-08-18 13:40:01 +0900 (Sat, 18 Aug 2018)

  New Revision: 64437

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64437

  Log:
    merge revision(s) 63698: [Backport #14856]
    
    lib/drb/extservm.rb (service): do not return `false'
    
    invoke_service_command may set entries in @servers to `false',
    making it incompatible with the intended use of the
    safe navigation operator.
    
    This caused occasional DRb test failures, but they were hidden
    with automatic retry.
    
    [ruby-core:87524] [Bug #14856]
    
    Fixes: r53111 ("use safe navigation operator")
    commit 059c9c1cf371e049c7481c78b76e9620da52757f [GH-1142]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/lib/drb/extservm.rb
    branches/ruby_2_5/version.h
Index: ruby_2_5/lib/drb/extservm.rb
===================================================================
--- ruby_2_5/lib/drb/extservm.rb	(revision 64436)
+++ ruby_2_5/lib/drb/extservm.rb	(revision 64437)
@@ -37,7 +37,7 @@ module DRb https://github.com/ruby/ruby/blob/trunk/ruby_2_5/lib/drb/extservm.rb#L37
       synchronize do
         while true
           server = @servers[name]
-          return server if server&.alive?
+          return server if server && server.alive? # server may be `false'
           invoke_service(name)
           @cond.wait
         end
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 64436)
+++ ruby_2_5/version.h	(revision 64437)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.2"
 #define RUBY_RELEASE_DATE "2018-08-18"
-#define RUBY_PATCHLEVEL 78
+#define RUBY_PATCHLEVEL 79
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 64436)
+++ ruby_2_5	(revision 64437)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r63698

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