1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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 059c9c1cf3 [GH-1142]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-07-30 14:06:52 +00:00
parent 08c74b7593
commit 5b5739df1c
2 changed files with 2 additions and 2 deletions

View file

@ -38,7 +38,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

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.5"
#define RUBY_RELEASE_DATE "2018-07-30"
#define RUBY_PATCHLEVEL 308
#define RUBY_PATCHLEVEL 309
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 7