diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-21 23:05:41 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-21 23:05:41 +0000 |
| commit | f845a9ef76c0195254ded79c85c24332534f4057 () | |
| tree | 015ae2e6909fd287ac1b3b18e0675196e181fb0d | |
| parent | 8e4c8e96429e939f6b527919b276f6cd97380ebc (diff) | |
lib/*: remove closed checks
Follow r56795. Since Ruby 2.2, calling #close on a closed socket no longer raises exceptions. * lib/cgi/session.rb (update): remove closed? check * lib/net/http.rb (finish, transport_request): ditto * lib/net/imap.rb (disconnect): ditto * lib/net/pop.rb (do_start, do_finish): ditto * lib/net/smtp.rb (do_start, do_finish): ditto * lib/open3.rb (popen_run, pipeline_run): ditto * lib/pstore.rb (transaction): ditto * lib/shell/process-controller.rb (sfork): * lib/tempfile (_close, call, Tempfile.create): ditto * lib/webrick/httpauth/htdigest.rb (flush): ditto * lib/webrick/httpauth/htpasswd.rb (flush): ditto * lib/webrick/server.rb (start_thread, cleanup_shutdown_pipe): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/cgi/session.rb | 2 | ||||
| -rw-r--r-- | lib/net/http.rb | 8 | ||||
| -rw-r--r-- | lib/net/imap.rb | 4 | ||||
| -rw-r--r-- | lib/net/pop.rb | 4 | ||||
| -rw-r--r-- | lib/net/smtp.rb | 4 | ||||
| -rw-r--r-- | lib/open3.rb | 4 | ||||
| -rw-r--r-- | lib/pstore.rb | 2 | ||||
| -rw-r--r-- | lib/shell/process-controller.rb | 2 | ||||
| -rw-r--r-- | lib/tempfile.rb | 6 | ||||
| -rw-r--r-- | lib/webrick/httpauth/htdigest.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httpauth/htpasswd.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/server.rb | 10 |
12 files changed, 23 insertions, 27 deletions
@@ -426,7 +426,7 @@ class CGI f.close File.rename @path+".new", @path ensure - f.close if f and !f.closed? lockf.close if lockf end end @@ -978,7 +978,7 @@ module Net #:nodoc: def do_finish @started = false - @socket.close if @socket and not @socket.closed? @socket = nil end private :do_finish @@ -1463,12 +1463,12 @@ module Net #:nodoc: Timeout::Error => exception if count == 0 && IDEMPOTENT_METHODS_.include?(req.method) count += 1 - @socket.close if @socket and not @socket.closed? D "Conn close because of error #{exception}, and retry" retry end D "Conn close because of error #{exception}" - @socket.close if @socket and not @socket.closed? raise end @@ -1476,7 +1476,7 @@ module Net #:nodoc: res rescue => exception D "Conn close because of error #{exception}" - @socket.close if @socket and not @socket.closed? raise exception end @@ -329,9 +329,7 @@ module Net end @receiver_thread.join synchronize do - unless @sock.closed? - @sock.close - end end raise e if e end @@ -570,7 +570,7 @@ module Net ensure # Authentication failed, clean up connection. unless @started - s.close if s and not s.closed? @socket = nil @command = nil end @@ -601,7 +601,7 @@ module Net ensure @started = false @command = nil - @socket.close if @socket and not @socket.closed? @socket = nil end private :do_finish @@ -567,7 +567,7 @@ module Net ensure unless @started # authentication failed, cancel connection. - s.close if s and not s.closed? @socket = nil end end @@ -613,7 +613,7 @@ module Net ensure @started = false @error_occurred = false - @socket.close if @socket and not @socket.closed? @socket = nil end @@ -204,7 +204,7 @@ module Open3 begin return yield(*result) ensure - parent_io.each{|io| io.close unless io.closed?} wait_thr.join end end @@ -655,7 +655,7 @@ module Open3 begin return yield(*result) ensure - parent_io.each{|io| io.close unless io.closed?} wait_thrs.each {|t| t.join } end end @@ -335,7 +335,7 @@ class PStore save_data(checksum, original_data_size, file) end ensure - file.close if !file.closed? end else # This can only occur if read_only == true. @@ -260,7 +260,7 @@ class Shell ObjectSpace.each_object(IO) do |io| if ![STDIN, STDOUT, STDERR].include?(io) - io.close unless io.closed? end end @@ -147,7 +147,7 @@ class Tempfile < DelegateClass(File) end def _close # :nodoc: - @tmpfile.close unless @tmpfile.closed? end protected :_close @@ -252,7 +252,7 @@ class Tempfile < DelegateClass(File) warn "removing #{@tmpfile.path}..." if $DEBUG - @tmpfile.close unless @tmpfile.closed? begin File.unlink(@tmpfile.path) rescue Errno::ENOENT @@ -334,7 +334,7 @@ def Tempfile.create(basename="", tmpdir=nil, mode: 0, **options) begin yield tmpfile ensure - tmpfile.close if !tmpfile.closed? File.unlink tmpfile end else @@ -79,7 +79,7 @@ module WEBrick File::rename(tmp.path, output) renamed = true ensure - tmp.close if !tmp.closed? File.unlink(tmp.path) if !renamed end end @@ -84,7 +84,7 @@ module WEBrick File::rename(tmp.path, output) renamed = true ensure - tmp.close if !tmp.closed? File.unlink(tmp.path) if !renamed end end @@ -309,7 +309,7 @@ module WEBrick else @logger.debug "close: <address unknown>" end - sock.close unless sock.closed? end } end @@ -334,11 +334,9 @@ module WEBrick @shutdown_pipe = nil return if !shutdown_pipe shutdown_pipe.each {|io| - if !io.closed? - begin - io.close - rescue IOError # another thread closed io. - end end } end |