diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-25 02:32:10 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-25 02:32:10 +0000 |
commit | 7cd6cc2119b6797482d3301eaeda8549767ef7c4 (patch) | |
tree | bf213382c128b4eb1423b4a5aebb9f3dc515e797 /lib | |
parent | 6c315ea9f05db577c3ca7dee1eb3ad15d19b53ef (diff) | |
download | ruby-7cd6cc2119b6797482d3301eaeda8549767ef7c4.tar.gz |
drb: simplify shutdown pipe close logic
IO#close is idempotent, so we don't need to waste bytecode
to check or nil it at shutdown time.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/drb/drb.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index dd725529c0..36b2b1ade4 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -961,14 +961,8 @@ module DRb end def close_shutdown_pipe - if @shutdown_pipe_r && !@shutdown_pipe_r.closed? - @shutdown_pipe_r.close - @shutdown_pipe_r = nil - end - if @shutdown_pipe_w && !@shutdown_pipe_w.closed? - @shutdown_pipe_w.close - @shutdown_pipe_w = nil - end + @shutdown_pipe_w.close + @shutdown_pipe_r.close end private :close_shutdown_pipe @@ -1001,7 +995,7 @@ module DRb # Graceful shutdown def shutdown - @shutdown_pipe_w.close if @shutdown_pipe_w && !@shutdown_pipe_w.closed? + @shutdown_pipe_w.close end # Check to see if this connection is alive. |