diff options
Diffstat (limited to 'lib/soap/mapping')
| -rw-r--r-- | lib/soap/mapping/factory.rb | 15 | ||||
| -rw-r--r-- | lib/soap/mapping/mapping.rb | 3 | ||||
| -rw-r--r-- | lib/soap/mapping/registry.rb | 26 |
3 files changed, 22 insertions, 22 deletions
diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb index 509fe369c4..f181773687 100644 --- a/lib/soap/mapping/factory.rb +++ b/lib/soap/mapping/factory.rb @@ -356,14 +356,21 @@ class HashFactory_ < Factory unless node.type == MapQName return false end - if node.key?('default') + if node.class == SOAPStruct and node.key?('default') return false end obj = create_empty_object(obj_class) mark_unmarshalled_obj(node, obj) - node.each do |key, value| - obj[Mapping._soap2obj(value['key'], map)] = - Mapping._soap2obj(value['value'], map) + if node.class == SOAPStruct + node.each do |key, value| + obj[Mapping._soap2obj(value['key'], map)] = + Mapping._soap2obj(value['value'], map) + end + else + node.each do |value| + obj[Mapping._soap2obj(value['key'], map)] = + Mapping._soap2obj(value['value'], map) + end end return true, obj end diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb index 32be9839c8..4b68b811fc 100644 --- a/lib/soap/mapping/mapping.rb +++ b/lib/soap/mapping/mapping.rb @@ -77,9 +77,10 @@ module Mapping end if detail.is_a?(Mapping::SOAPException) begin + remote_backtrace = detail.to_e.backtrace raise detail.to_e rescue Exception => e2 - detail.set_backtrace(e2) + e2.set_backtrace(remote_backtrace + e2.backtrace) raise end else diff --git a/lib/soap/mapping/registry.rb b/lib/soap/mapping/registry.rb index 51ad939d99..46a04e368f 100644 --- a/lib/soap/mapping/registry.rb +++ b/lib/soap/mapping/registry.rb @@ -34,11 +34,9 @@ RubyIVarName = XSD::QName.new(RubyTypeInstanceNamespace, 'ivars') # Inner class to pass an exception. class SOAPException; include Marshallable - attr_reader :excn_type_name, :message, :backtrace, :cause + attr_reader :excn_type_name, :cause def initialize(e) @excn_type_name = Mapping.name2elename(e.class.to_s) - @message = e.message - @backtrace = e.backtrace @cause = e end @@ -50,25 +48,15 @@ class SOAPException; include Marshallable klass = Mapping.class_from_name( Mapping.elename2name(@excn_type_name.to_s)) if klass.nil? - raise RuntimeError.new(@message) + raise RuntimeError.new(@cause.message) end unless klass <= ::Exception raise NameError.new end - obj = klass.new(@message) + obj = klass.new(@cause.message) obj.extend(::SOAP::Mapping::MappedException) obj end - - def set_backtrace(e) - e.set_backtrace( - if @backtrace.is_a?(Array) - @backtrace - else - [@backtrace.inspect] - end - ) - end end @@ -238,10 +226,12 @@ class Registry [::String, ::SOAP::SOAPGMonth, BasetypeFactory], [::String, ::SOAP::SOAPQName, BasetypeFactory], + [::Hash, ::SOAP::SOAPArray, HashFactory], + [::Hash, ::SOAP::SOAPStruct, HashFactory], + [::Array, ::SOAP::SOAPArray, ArrayFactory, {:derived_class => true}], - [::Hash, ::SOAP::SOAPStruct, HashFactory], [::SOAP::Mapping::SOAPException, ::SOAP::SOAPStruct, TypedStructFactory, {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}], @@ -282,10 +272,12 @@ class Registry [::String, ::SOAP::SOAPGMonth, BasetypeFactory], [::String, ::SOAP::SOAPQName, BasetypeFactory], + [::Hash, ::SOAP::SOAPArray, HashFactory], + [::Hash, ::SOAP::SOAPStruct, HashFactory], + # Does not allow Array's subclass here. [::Array, ::SOAP::SOAPArray, ArrayFactory], - [::Hash, ::SOAP::SOAPStruct, HashFactory], [::SOAP::Mapping::SOAPException, ::SOAP::SOAPStruct, TypedStructFactory, {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}], |