Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 18212 invoked from network); 10 Jun 2005 03:05:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Jun 2005 03:05:19 -0000 Received: (qmail 86784 invoked by uid 500); 10 Jun 2005 03:05:17 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 86698 invoked by uid 500); 10 Jun 2005 03:05:17 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 86681 invoked by uid 99); 10 Jun 2005 03:05:16 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 09 Jun 2005 20:05:12 -0700 Received: (qmail 18100 invoked by uid 1203); 10 Jun 2005 03:04:52 -0000 Date: 10 Jun 2005 03:04:52 -0000 Message-ID: <20050610030452.18099.qmail@minotaur.apache.org> From: dims@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/encoding SerializationContext.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N dims 2005/06/09 20:04:52 Modified: java/src/org/apache/axis/encoding SerializationContext.java Log: Fix for AXIS-2021 - String Array Regression causes SAXException: Found character data ... Revision Changes Path 1.109 +9 -2 ws-axis/java/src/org/apache/axis/encoding/SerializationContext.java Index: SerializationContext.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/SerializationContext.java,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- SerializationContext.java 4 May 2005 09:45:27 -0000 1.108 +++ SerializationContext.java 10 Jun 2005 03:04:52 -0000 1.109 @@ -1397,8 +1397,15 @@ if (shouldSendType || (xmlType != null && (!xmlType.equals(actualXMLType.value)))) { - if (!isEncoded() && Constants.isSOAP_ENC(actualXMLType.value.getNamespaceURI())) { - // Don't write SOAP_ENC types (i.e. Array) if we're not using encoding + + if(!isEncoded()) { + if (Constants.isSOAP_ENC(actualXMLType.value.getNamespaceURI())) { + // Don't write SOAP_ENC types (i.e. Array) if we're not using encoding + } else { + if(!(javaType.isArray() && xmlType != null && Constants.isSchemaXSD(xmlType.getNamespaceURI())) ) { + writeXMLType = actualXMLType.value; + } + } } else { writeXMLType = actualXMLType.value; }