Changeset 1908

Timestamp:

07/31/07 22:12:18 (1 year ago)

Author:

nahi

Message:

• avoid NoMethodError? when passing SOAPArray to LiteralRegistry?. It's caused when a servant raised an exception in literal service. Thanks to Emil for contributing test case for it. closes #393.
  

Files:

• trunk/lib/soap/baseData.rb (modified) (4 diffs)
• trunk/lib/soap/mapping/encodedregistry.rb (modified) (2 diffs)
• trunk/lib/soap/mapping/literalregistry.rb (modified) (2 diffs)
• trunk/lib/soap/rpc/router.rb (modified) (1 diff)
• trunk/test/soap/fault/test_soaparray.rb (added)

trunk/lib/soap/baseData.rb

@@ -107 +107 @@
-end
-
+# marker for compound types which have named accessor
+module SOAPNameAccessible
+end
+
-
-###
@@ -509 +513 @@
-#
-class SOAPStruct < XSD::NSDBase
+  include Enumerable
-  include SOAPCompoundtype
-Enumera
+SOAPNameAccessi
-
-public
@@ -627 +632 @@
-  include Enumerable
-  include SOAPCompoundtype
+  include SOAPNameAccessible
-
-  attr_accessor :type
@@ -694 +700 @@
-
-  def to_obj
-members.empty?
+!have_member
-      @text
-    else

trunk/lib/soap/mapping/encodedregistry.rb

@@ -325 +325 @@
-  def _obj2soap(obj, type_qname = nil)
-    ret = nil
-Struct) or obj.is_a?(SOAPArray
+Compoundtype
-      obj.replace do |ele|
-        Mapping._obj2soap(ele, self)
@@ -366 +366 @@
-      klass = definition.class_for if definition
-    end
-Struct
+NameAccessible
-      return elesoap2stubobj(node, klass, definition)
-    end

trunk/lib/soap/mapping/literalregistry.rb

@@ -227 +227 @@
-      if definition
-        return elesoap2stubobj(node, obj_class, definition)
-e
+if node.is_a?(::SOAP::SOAPNameAccessible)
-        return elesoap2plainobj(node)
-      end
@@ -250 +250 @@
-  def elesoap2plainobj(node)
-    obj = nil
-node.members.empty?
+!node.have_member
-      obj = base2obj(node, ::SOAP::SOAPString)
-    else

trunk/lib/soap/rpc/router.rb

@@ -477 +477 @@
-    def request_rpc(body, mapping_registry, literal_mapping_registry, opt)
-      request = body.request
-Struct
+NameAccessible
-        if request.is_a?(SOAPNil)
-          # SOAP::Lite/0.69 seems to send xsi:nil="true" element as a request.