Merge 23e25c2 into 3b2f9ba

amazon-archives · Dec 16, 2014 · f7a5199 · f7a5199
2 parents 3b2f9ba + 23e25c2
commit f7a5199
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/aws-sdk-core/lib/aws-sdk-core/xml/parser.rb b/aws-sdk-core/lib/aws-sdk-core/xml/parser.rb
@@ -5,7 +5,6 @@
 module Aws
   module Xml
     class Parser
-
       # @param [Seahorse::Model::Shapes::Structure] shape
       def initialize(shape)
         @shape = shape
@@ -15,7 +14,10 @@ def initialize(shape)
       # @param [Hash, nil] target
       # @return [Structure]
       def parse(xml, target = nil, &block)
-        xml = MultiXml.parse(xml).values.first || {}
+        parsed_xml = MultiXml.parse(xml)
+        xml = parsed_xml.values.first if parsed_xml && parsed_xml.values
+        xml ||= {}
+
         yield(xml) if block_given?
         structure(@shape, xml, target)
       end
@@ -133,7 +135,6 @@ def timestamp(value)
       def flat?(shape)
         !!shape.metadata('flattened')
       end
-
     end
   end
 end