diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/drb/drb.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index d627ec1035..1ed5605007 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1467,12 +1467,13 @@ module DRb if Thread.current['DRb'] && Thread.current['DRb']['server'] == self Thread.current['DRb']['stop_service'] = true else + threads = [@thread, *@grp.list] if @protocol.respond_to? :shutdown @protocol.shutdown else - @thread.kill # xxx: Thread#kill + threads.each {|thread| thread.kill} # xxx: Thread#kill end - @thread.join + threads.each {|thread| thread.join} end end |