diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/tempfile.rb | 11 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Wed Mar 24 10:05:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/tempfile.rb (Tempfile::_close): should not clear @tmpname + until the file is really removed. [ruby-core:02684] + Wed Mar 24 04:12:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * object.c (rb_mod_cvar_get): new method Module#class_variable_get. diff --git a/lib/tempfile.rb b/lib/tempfile.rb index 2169a20ec5..8ebabc9ea9 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -76,12 +76,13 @@ class Tempfile < SimpleDelegator def _close # :nodoc: @tmpfile.close if @tmpfile - @data[1] = @tmpfile = nil - @data = @tmpname = nil + @tmpfile = nil + @data[1] = nil if @data + @data = nil end protected :_close - # Closes the file. If the optional flag is true, unlinks the file + #Closes the file. If the optional flag is true, unlinks the file # after closing. # # If you don't explicitly unlink the temporary file, the removal @@ -99,6 +100,7 @@ class Tempfile < SimpleDelegator _close @clean_proc.call ObjectSpace.undefine_finalizer(self) + @tmpname = nil end # Unlinks the file. On UNIX-like systems, it is often a good idea @@ -108,7 +110,8 @@ class Tempfile < SimpleDelegator def unlink # keep this order for thread safeness File.unlink(@tmpname) if File.exist?(@tmpname) - @@cleanlist.delete(@tmpname) if @@cleanlist + @@cleanlist.delete(@tmpname) + @tmpname = nil end alias delete unlink |