aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-02 15:16:58 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-02 15:16:58 -0700
commitbf520b1dfb32c53a08802f2d32364441f0c4cf4e (patch)
treeda32a934dc206dd5512f94f5c6e3b15688786f5c /activesupport
parentfd20f2e3c056cbac64690b2c0a33dac90c3aed3f (diff)
parentae50fd61c61b373dff0e58b826036c89441df059 (diff)
downloadrails-bf520b1dfb32c53a08802f2d32364441f0c4cf4e.tar.gz
rails-bf520b1dfb32c53a08802f2d32364441f0c4cf4e.tar.bz2
rails-bf520b1dfb32c53a08802f2d32364441f0c4cf4e.zip
Merge pull request #11725 from atambo/jruby_capture_unlink
Fix jruby warning when capture calls unlink on an open tempfile
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/kernel/reporting.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/kernel/reporting.rb b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
index 79d3303b41..36ab836457 100644
--- a/activesupport/lib/active_support/core_ext/kernel/reporting.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
@@ -91,6 +91,7 @@ module Kernel
stream_io.rewind
return captured_stream.read
ensure
+ captured_stream.close
captured_stream.unlink
stream_io.reopen(origin_stream)
end