aboutsummaryrefslogtreecommitdiffstats
path: root/lib/drb/drb.rb
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-19 15:40:13 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-19 15:40:13 +0000
commitf7f17e3ddd89285de9378724be2dd5960e306254 (patch)
treefe258ebcfe2f449612960eff3ac348bad82064c8 /lib/drb/drb.rb
parent798148e38db51e0859d6b62cbcbfe5c1e1588f61 (diff)
downloadruby-f7f17e3ddd89285de9378724be2dd5960e306254.tar.gz
Break out of the loop after shutdown in DRbServer
* Patch by @seki: https://gist.github.com/seki/ae8bef20238c37c94a91b5461c4bfbdd git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/drb/drb.rb')
-rw-r--r--lib/drb/drb.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 3e2df7aafc..e47b303aa4 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1678,7 +1678,10 @@ module DRb
error_print(e) if verbose
ensure
client.close unless succ
- shutdown if Thread.current['DRb']['stop_service']
+ if Thread.current['DRb']['stop_service']
+ shutdown
+ break
+ end
break unless succ
end
end