diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-26 09:49:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-26 09:49:28 +0000 |
| commit | ffd0da0333dd413d041ce25e4066c97890343a0c (patch) | |
| tree | 13c217d06d43469bad1b649972ae1f61b3c7d4fd | |
| parent | c6defbf3108a0cd1d16184dafe5fba9e2542cf39 (diff) | |
* lib/tempfile.rb (Tempfile#close!): should not undefine finalizer
by just unlink.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/tempfile.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Aug 26 18:49:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/tempfile.rb (Tempfile#close!): should not undefine finalizer + by just unlink. + Wed Aug 26 17:00:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61 diff --git a/lib/tempfile.rb b/lib/tempfile.rb index 57127c7214..34d036fd6a 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -126,6 +126,7 @@ class Tempfile < DelegateClass(File) def close! _close unlink + ObjectSpace.undefine_finalizer(self) end # Unlinks the file. On UNIX-like systems, it is often a good idea @@ -143,7 +144,6 @@ class Tempfile < DelegateClass(File) # remove tmpname and cleanlist from callback @data[0] = @data[2] = nil @data = @tmpname = nil - ObjectSpace.undefine_finalizer(self) rescue Errno::EACCES # may not be able to unlink on Windows; just ignore end |