diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-18 15:06:06 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-18 15:06:06 +0000 |
| commit | 5a55683bc62b827b3a0bb7d39587ce68dd993520 (patch) | |
| tree | d9dbac4573637d16cb5967d6768ff7da3a8cb828 /lib | |
| parent | 54380d99f833eaac517c5be4f6753f015dcaed2d (diff) | |
* lib/drb/drb.rb (DRbServer#stop_service): join killed thread to
ensure service stops. [ruby-dev:40441]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/drb/drb.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index a2c11f980d..4712306fe0 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1394,7 +1394,7 @@ module DRb if Thread.current['DRb'] && Thread.current['DRb']['server'] == self Thread.current['DRb']['stop_service'] = true else - @thread.kill + @thread.kill.join end end |