ayumin	2012-02-07 14:04:02 +0900 (Tue, 07 Feb 2012)

  New Revision: 34455

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

  Log:
    merge revision(s) 34252:
    
    * lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even
      when exception is raised at @tempfile.close. [ruby-dev:45113]
    
    * lib/tempfile.rb (Tempfile#unlink): fix a typo.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/tempfile.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34454)
+++ ruby_1_9_3/ChangeLog	(revision 34455)
@@ -1,3 +1,10 @@
+Tue Feb  7 14:03:45 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even
+	  when exception is raised at @tempfile.close. [ruby-dev:45113]
+
+	* lib/tempfile.rb (Tempfile#unlink): fix a typo.
+
 Tue Feb  7 14:02:32 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* test/ruby/test_io.rb (test_autoclose_true_closed_by_finalizer,
Index: ruby_1_9_3/lib/tempfile.rb
===================================================================
--- ruby_1_9_3/lib/tempfile.rb	(revision 34454)
+++ ruby_1_9_3/lib/tempfile.rb	(revision 34455)
@@ -162,9 +162,12 @@
   end
 
   def _close    # :nodoc:
-    @tmpfile.close if @tmpfile
-    @tmpfile = nil
-    @data[1] = nil if @data
+    begin
+      @tmpfile.close if @tmpfile
+    ensure
+      @tmpfile = nil
+      @data[1] = nil if @data
+    end
   end
   protected :_close
 
@@ -231,7 +234,7 @@
         File.unlink(@tmpname)
       end
       # remove tmpname from remover
-      @data[0] = @data[2] = nil
+      @data[0] = @data[1] = nil
       @tmpname = nil
     rescue Errno::EACCES
       # may not be able to unlink on Windows; just ignore
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34454)
+++ ruby_1_9_3/version.h	(revision 34455)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 48
+#define RUBY_PATCHLEVEL 49
 
 #define RUBY_RELEASE_DATE "2012-02-07"
 #define RUBY_RELEASE_YEAR 2012

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