Merge pull request #2578 from Bugagazavr/master

[OpenStack] Decode body to array
fog · Jan 24, 2014 · 28e8259 · 28e8259
2 parents 1167c4a + f7c22c8
commit 28e8259
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/fog/openstack/models/storage/directories.rb b/lib/fog/openstack/models/storage/directories.rb
@@ -24,6 +24,7 @@ def get(key, options = {})
           end
           directory.files.merge_attributes(options)
           directory.files.instance_variable_set(:@loaded, true)
+
           data.body.each do |file|
             directory.files << directory.files.new(file)
           end

diff --git a/lib/fog/openstack/storage.rb b/lib/fog/openstack/storage.rb
@@ -172,7 +172,7 @@ def request(params, parse_json = true)
               error
             end
           end
-          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
+          if !response.body.empty? && parse_json && response.get_header('Content-Type') =~ %r{application/json}
             response.body = Fog::JSON.decode(response.body)
           end
           response