mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/tempfile.rb (Tempfile#unlink): leave @data. Assigning nil to
@data caused double closing error of the same IO in finalizer. a patch from Simon Nicholls. [ruby-core:29395] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2a0c12cce4
commit
d980b8f61a
2 changed files with 7 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
Sun May 30 21:48:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||||
|
|
||||||
|
* lib/tempfile.rb (Tempfile#unlink): leave @data. Assigning nil to
|
||||||
|
@data caused double closing error of the same IO in finalizer. a
|
||||||
|
patch from Simon Nicholls. [ruby-core:29395]
|
||||||
|
|
||||||
Sun May 30 18:47:15 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
Sun May 30 18:47:15 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* ext/nkf/nkf-utf8/nkf.c: updated to b856dd07.
|
* ext/nkf/nkf-utf8/nkf.c: updated to b856dd07.
|
||||||
|
|
|
@ -236,7 +236,7 @@ class Tempfile < DelegateClass(File)
|
||||||
end
|
end
|
||||||
# remove tmpname from remover
|
# remove tmpname from remover
|
||||||
@data[0] = @data[2] = nil
|
@data[0] = @data[2] = nil
|
||||||
@data = @tmpname = nil
|
@tmpname = nil
|
||||||
rescue Errno::EACCES
|
rescue Errno::EACCES
|
||||||
# may not be able to unlink on Windows; just ignore
|
# may not be able to unlink on Windows; just ignore
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue