Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 38385 invoked from network); 27 Jun 2007 07:16:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jun 2007 07:16:24 -0000 Received: (qmail 29954 invoked by uid 500); 27 Jun 2007 07:16:24 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 29888 invoked by uid 500); 27 Jun 2007 07:16:24 -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 29875 invoked by uid 500); 27 Jun 2007 07:16:24 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 29801 invoked by uid 99); 27 Jun 2007 07:16:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jun 2007 00:16:23 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Wed, 27 Jun 2007 00:16:19 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9363B1A981A; Wed, 27 Jun 2007 00:15:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r551082 - /webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Date: Wed, 27 Jun 2007 07:15:59 -0000 To: axis2-cvs@ws.apache.org From: amilas@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070627071559.9363B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: amilas Date: Wed Jun 27 00:15:58 2007 New Revision: 551082 URL: http://svn.apache.org/viewvc?view=rev&rev=551082 Log: fixed issue Axis2-1522 Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=551082&r1=551081&r2=551082 ============================================================================== --- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original) +++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Wed Jun 27 00:15:58 2007 @@ -722,6 +722,11 @@ private XmlSchema resolveParentSchema(QName schemaTypeName, XmlSchema currentSchema) throws SchemaCompilationException { String targetNamespace = schemaTypeName.getNamespaceURI(); + + // if the current schema has the same namespace we use it + if (currentSchema.getTargetNamespace().equals(targetNamespace)){ + return currentSchema; + } Object loadedSchema = loadedSchemaMap.get(targetNamespace); if (loadedSchema != null) { return (XmlSchema) loadedSchema; @@ -1012,7 +1017,7 @@ if (xmlSchemaAttributeGroup != null){ processAttributes(xmlSchemaAttributeGroup.getAttributes(),metaInfHolder,parentSchema); } else { - throw new SchemaCompilationException("Can not find an attribute group for group reference" + throw new SchemaCompilationException("Can not find an attribute group for group reference " + attributeGroupRefName.getLocalPart()); } } else { --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org