Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 85471 invoked from network); 6 Jun 2006 09:29:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Jun 2006 09:29:11 -0000 Received: (qmail 1593 invoked by uid 500); 6 Jun 2006 09:29:09 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 1499 invoked by uid 500); 6 Jun 2006 09:29:09 -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 1488 invoked by uid 500); 6 Jun 2006 09:29:09 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 1485 invoked by uid 99); 6 Jun 2006 09:29:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 02:29:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2006 02:29:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 65F521A983A; Tue, 6 Jun 2006 02:28:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412056 - /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SchemaUtil.java Date: Tue, 06 Jun 2006 09:28:47 -0000 To: axis2-cvs@ws.apache.org From: chinthaka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060606092848.65F521A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chinthaka Date: Tue Jun 6 02:28:47 2006 New Revision: 412056 URL: http://svn.apache.org/viewvc?rev=412056&view=rev Log: - Fixing http://issues.apache.org/jira/browse/AXIS2-786. Removing a possible NPE. Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SchemaUtil.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SchemaUtil.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SchemaUtil.java?rev=412056&r1=412055&r2=412056&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SchemaUtil.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SchemaUtil.java Tue Jun 6 02:28:47 2006 @@ -15,23 +15,23 @@ */ package org.apache.axis2.util; +import org.apache.axiom.om.OMElement; +import org.apache.axiom.soap.SOAPBody; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; -import org.apache.axiom.soap.SOAPBody; -import org.apache.axiom.om.OMElement; -import org.apache.axis2.context.MessageContext; import org.apache.axis2.AxisFault; import org.apache.axis2.HTTPConstants; -import org.apache.ws.commons.schema.XmlSchemaElement; -import org.apache.ws.commons.schema.XmlSchemaType; +import org.apache.axis2.context.MessageContext; import org.apache.ws.commons.schema.XmlSchemaComplexType; +import org.apache.ws.commons.schema.XmlSchemaElement; import org.apache.ws.commons.schema.XmlSchemaParticle; import org.apache.ws.commons.schema.XmlSchemaSequence; +import org.apache.ws.commons.schema.XmlSchemaType; import javax.servlet.http.HttpServletRequest; import javax.xml.namespace.QName; -import java.util.Map; import java.util.Iterator; +import java.util.Map; /** * @@ -102,7 +102,7 @@ XmlSchemaElement innerElement = (XmlSchemaElement) iterator.next(); String name = innerElement.getName(); String[] parameterValuesArray = (String[]) parameterMap.get(name); - if (parameterValuesArray.length > 0 && + if (parameterValuesArray != null && !"".equals(parameterValuesArray[0]) && parameterValuesArray[0] != null) { soapFactory.createOMElement(name, null, --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org