Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 36370 invoked from network); 30 Nov 2007 19:21:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Nov 2007 19:21:40 -0000 Received: (qmail 33330 invoked by uid 500); 30 Nov 2007 19:21:28 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 33278 invoked by uid 500); 30 Nov 2007 19:21:28 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 33269 invoked by uid 99); 30 Nov 2007 19:21:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 11:21:28 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 19:21:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 68ECC1A9832; Fri, 30 Nov 2007 11:21:17 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r599921 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java Date: Fri, 30 Nov 2007 19:21:17 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071130192117.68ECC1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Nov 30 11:21:16 2007 New Revision: 599921 URL: http://svn.apache.org/viewvc?rev=599921&view=rev Log: Merged revisions 598031 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r598031 | bimargulies | 2007-11-25 14:08:15 -0500 (Sun, 25 Nov 2007) | 1 line remove noisy and invalid warning ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java?rev=599921&r1=599920&r2=599921&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java (original) +++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java Fri Nov 30 11:21:16 2007 @@ -164,6 +164,9 @@ */ public void validateQNameNamespace(QName qname) { // astonishingly, xmlSchemaCollection has no accessor by target URL. + if ("".equals(qname.getNamespaceURI())) { + return; // references to the 'unqualified' namespace are OK even if there is no schema for it. + } for (XmlSchema schema : schemaCollection.getXmlSchemas()) { if (schema.getTargetNamespace().equals(qname.getNamespaceURI())) { return;