diff options
| author | Marek Kirejczyk <marekkirejczyk@users.noreply.github.com> | 2016-05-21 14:14:22 +0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-05-21 09:14:22 -0300 |
| commit | dd829df07e632209404b025423f57d63148d0867 (patch) | |
| tree | 99118e90592dcbbfc11b836e878b6487c363ef58 /activesupport/lib/active_support | |
| parent | 91421984b7182a483db0f96239e2d5f27ea3a9de (diff) | |
| download | rails-dd829df07e632209404b025423f57d63148d0867.tar.gz rails-dd829df07e632209404b025423f57d63148d0867.tar.bz2 rails-dd829df07e632209404b025423f57d63148d0867.zip | |
Fix Hash#from_xml with frozen strings (#24718)
* Hash#from_xml works with frozen strings
Fixes #24647
* Fix rexml engine test
[Marek Kirejczyk + Rafael Mendonça França]
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/xml_mini/rexml.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/xml_mini/rexml.rb b/activesupport/lib/active_support/xml_mini/rexml.rb index 924ed72345..95af5af2c0 100644 --- a/activesupport/lib/active_support/xml_mini/rexml.rb +++ b/activesupport/lib/active_support/xml_mini/rexml.rb @@ -20,11 +20,9 @@ module ActiveSupport data = StringIO.new(data || '') end - char = data.getc - if char.nil? + if data.eof? {} else - data.ungetc(char) silence_warnings { require 'rexml/document' } unless defined?(REXML::Document) doc = REXML::Document.new(data) |