axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/encoding/ser ArraySerializer.java
Date Thu, 03 Oct 2002 14:39:04 GMT
rubys       2002/10/03 07:39:04

  Modified:    java/src/org/apache/axis/encoding Tag: axis1_0
                        SerializationContext.java
                        SerializationContextImpl.java
               java/src/org/apache/axis/encoding/ser Tag: axis1_0
                        ArraySerializer.java
  Log:
  Backport ArraySerializer fix to 1.0
  +1 Votes: Doug, Rick, Sam
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.82.4.1  +0 -15     xml-axis/java/src/org/apache/axis/encoding/SerializationContext.java
  
  Index: SerializationContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContext.java,v
  retrieving revision 1.82
  retrieving revision 1.82.4.1
  diff -u -r1.82 -r1.82.4.1
  --- SerializationContext.java	5 Sep 2002 01:08:37 -0000	1.82
  +++ SerializationContext.java	3 Oct 2002 14:39:04 -0000	1.82.4.1
  @@ -123,21 +123,6 @@
                             Boolean sendType)
           throws IOException;
   
  -    /**
  -     * Invoked to do the actual serialization of the qName (called by serialize above).
  -     * additional attributes that will be serialized with the qName.
  -     * @param elemQName is the QName of the element
  -     * @param attributes are additional attributes
  -     * @param value is the object to serialize
  -     * @param xmlType (optional) is the desired type QName.
  -     * @param sendType indicates whether the xsi:type attribute should be set.
  -     */
  -    public void serializeActual(QName elemQName, 
  -                                Attributes attributes,
  -                                Object value, 
  -                                QName xmlType,
  -                                Boolean sendType)
  -        throws IOException;
   
       /**
        * Obtains the type attribute that should be serialized and returns the new list of
Attributes
  
  
  
  1.73.2.3  +2 -2      xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
  
  Index: SerializationContextImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
  retrieving revision 1.73.2.2
  retrieving revision 1.73.2.3
  diff -u -r1.73.2.2 -r1.73.2.3
  --- SerializationContextImpl.java	30 Sep 2002 13:19:25 -0000	1.73.2.2
  +++ SerializationContextImpl.java	3 Oct 2002 14:39:04 -0000	1.73.2.3
  @@ -1168,7 +1168,7 @@
        * @param xmlType (optional) is the desired type QName.
        * @param sendType indicates whether the xsi:type attribute should be set.
        */
  -    public void serializeActual(QName elemQName,
  +    private void serializeActual(QName elemQName,
                                   Attributes attributes,
                                   Object value,
                                   QName xmlType,
  @@ -1195,7 +1195,7 @@
               currentXMLType = xmlType;
   
               // if we're looking for xsd:anyType, accept anything...
  -            if (Constants.XSD_ANYTYPE.equals(xmlType)) {
  +            if (Constants.equals(Constants.XSD_ANYTYPE,xmlType)){
                   xmlType = null;
                   shouldSendType = true;
               }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.36.2.1  +3 -5      xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java
  
  Index: ArraySerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java,v
  retrieving revision 1.36
  retrieving revision 1.36.2.1
  diff -u -r1.36 -r1.36.2.1
  --- ArraySerializer.java	25 Sep 2002 03:21:08 -0000	1.36
  +++ ArraySerializer.java	3 Oct 2002 14:39:04 -0000	1.36.2.1
  @@ -223,12 +223,10 @@
           // actual schema array or for a maxOccurs usage.
           // For the maxOccurs case, the currentXMLType of the context is
           // the same as the componentQName.
  -        boolean maxOccursUsage = componentQName.equals(context.getCurrentXMLType());
  +        boolean maxOccursUsage = !context.getMessageContext().isEncoded() &&
  +                                          componentQName.equals(context.getCurrentXMLType());
   
  -        // Are we encoded?
  -        boolean isEncoded = context.getMessageContext().isEncoded();
  -
  -        if (isEncoded && !maxOccursUsage) {
  +        if (!maxOccursUsage) {
               AttributesImpl attrs;
               if (attributes == null) {
                   attrs = new AttributesImpl();
  
  
  

Mime
View raw message