Merge pull request #1786 from ceraslabs/release_address

Gaurd error of parsing non-JSON response
2013-06-10 18:24:37 -07:00 · 2013-06-10 18:24:37 -07:00 · 8663e9079e
parent 50a570f19e 737773eac5
commit 8663e9079e
1 changed files with 1 additions and 1 deletions
--- a/lib/fog/openstack/compute.rb
+++ b/lib/fog/openstack/compute.rb
@ -363,7 +363,7 @@ module Fog
              end
          end

-          unless response.body.empty?
+          if !response.body.empty? and response.get_header('Content-Type') == 'application/json'
            response.body = Fog::JSON.decode(response.body)
          end