summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-10 15:58:59 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-10 15:58:59 +0000
commit940104867afa60068c4cc8410b3b0597509832cd (patch)
tree1d0deff6755ff4fd4846f3312ca975837aa8271c /lib
parentf8beb090b7237413ae223967896a4e06e169d327 (diff)
merges r28093 from trunk into ruby_1_9_2.
-- * 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/branches/ruby_1_9_2@28266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rwxr-xr-xlib/tempfile.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index c45865d7a3..54f00de2b0 100755
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -236,7 +236,7 @@ class Tempfile < DelegateClass(File)
end
# remove tmpname from remover
@data[0] = @data[2] = nil
- @data = @tmpname = nil
+ @tmpname = nil
rescue Errno::EACCES
# may not be able to unlink on Windows; just ignore
end