duftler     01/09/06 13:34:17

  Modified:    java/src/org/apache/soap/encoding/soapenc
                        ArraySerializer.java HashtableSerializer.java
                        VectorSerializer.java
  Log:
  Fixed a bug that prevented a service's method from taking a Hashtable,
    array, or Vector, as a parameter, while returning a DOM Element.
  See bug #2470 for more info:
    http://nagoya.apache.org/bugzilla/show_bug.cgi?id=2470
  Submitted by: Richard Boehme ([EMAIL PROTECTED])
  Reviewed by: Matthew J. Duftler ([EMAIL PROTECTED])
  
  Revision  Changes    Path
  1.9       +1 -1      
xml-soap/java/src/org/apache/soap/encoding/soapenc/ArraySerializer.java
  
  Index: ArraySerializer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/ArraySerializer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ArraySerializer.java      2001/05/19 04:37:52     1.8
  +++ ArraySerializer.java      2001/09/06 20:34:17     1.9
  @@ -130,7 +130,7 @@
           {
             Class actualComponentType = value.getClass();
   
  -          xjmr.marshall(inScopeEncStyle, actualComponentType, value, "item",
  +          xjmr.marshall(Constants.NS_URI_SOAP_ENC, actualComponentType, value, 
"item",
                           sink, nsStack, ctx);
           }
   
  
  
  
  1.2       +6 -5      
xml-soap/java/src/org/apache/soap/encoding/soapenc/HashtableSerializer.java
  
  Index: HashtableSerializer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/HashtableSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HashtableSerializer.java  2001/05/18 03:14:43     1.1
  +++ HashtableSerializer.java  2001/09/06 20:34:17     1.2
  @@ -118,21 +118,22 @@
           sink.write(StringUtils.lineSeparator);
   
           // ??? Deal with null keys?
  -        xjmr.marshall(inScopeEncStyle, key.getClass(), key, STR_KEY,
  +        xjmr.marshall(Constants.NS_URI_SOAP_ENC, key.getClass(), key, STR_KEY,
                         sink, nsStack, ctx);
           sink.write(StringUtils.lineSeparator);
   
           if (value == null)
           {
  -          SoapEncUtils.generateNullStructure(inScopeEncStyle, Object.class,
  -                                             STR_VALUE, sink, nsStack, xjmr);
  +          SoapEncUtils.generateNullStructure(Constants.NS_URI_SOAP_ENC,
  +                                             Object.class, STR_VALUE, sink,
  +                                             nsStack, xjmr);
           }
           else
           {
             Class actualComponentType = value.getClass();
   
  -          xjmr.marshall(inScopeEncStyle, actualComponentType, value, STR_VALUE,
  -                        sink, nsStack, ctx);
  +          xjmr.marshall(Constants.NS_URI_SOAP_ENC, actualComponentType, value,
  +                        STR_VALUE, sink, nsStack, ctx);
           }
   
           sink.write(StringUtils.lineSeparator);
  
  
  
  1.7       +5 -4      
xml-soap/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
  
  Index: VectorSerializer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VectorSerializer.java     2001/05/11 17:38:22     1.6
  +++ VectorSerializer.java     2001/09/06 20:34:17     1.7
  @@ -140,15 +140,16 @@
   
           if (value == null)
           {
  -          SoapEncUtils.generateNullStructure(inScopeEncStyle, Object.class,
  -                                             "item", sink, nsStack, xjmr);
  +          SoapEncUtils.generateNullStructure(Constants.NS_URI_SOAP_ENC,
  +                                             Object.class, "item", sink,
  +                                             nsStack, xjmr);
           }
           else
           {
             Class actualComponentType = value.getClass();
   
  -          xjmr.marshall(inScopeEncStyle, actualComponentType, value, "item",
  -                        sink, nsStack, ctx);
  +          xjmr.marshall(Constants.NS_URI_SOAP_ENC, actualComponentType, value,
  +                        "item", sink, nsStack, ctx);
           }
   
           sink.write(StringUtils.lineSeparator);
  
  
  

Reply via email to