yugui	2010-06-11 00:58:59 +0900 (Fri, 11 Jun 2010)

  New Revision: 28266

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28266

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/tempfile.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28265)
+++ ruby_1_9_2/ChangeLog	(revision 28266)
@@ -1,3 +1,9 @@
+Sun May 30 21:48:07 2010  Yusuke Endoh  <mame@t...>
+
+	* 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 16:54:34 2010  Yusuke Endoh  <mame@t...>
 
 	* file.c (rb_file_directory_p): update rdoc.  a patch from Ilkka
Index: ruby_1_9_2/lib/tempfile.rb
===================================================================
--- ruby_1_9_2/lib/tempfile.rb	(revision 28265)
+++ ruby_1_9_2/lib/tempfile.rb	(revision 28266)
@@ -236,7 +236,7 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/