summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-18 04:40:01 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-18 04:40:01 +0000
commit05d74883839e2d9921c16c2a04eb7ad68279bd65 (patch)
treeb25c66798c6b2f516f89b82f746c205984b99984 /lib
parenta814ab9efc82d0505350c7f0f04d565eaa9c53a4 (diff)
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/drb/extservm.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 5d779f51f5..2d3c369bbf 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -37,7 +37,7 @@ module DRb
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