Author: mukulg
Date: Sat Aug 25 16:27:22 2012
New Revision: 1377318
URL: http://svn.apache.org/viewvc?rev=1377318&view=rev
Log:
committing fix for jira issue, XERCESJ-1578
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=1377318&r1=1377317&r2=1377318&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Sat Aug 25 16:27:22 2012
@@ -1212,10 +1212,10 @@ public class XSDHandler {
// the existing global components
boolean alreadyTraversed = (fNamespaceGrowth) ?
sg.getDocumentLocations().contains(schemaId) : false;
if (!alreadyTraversed) {
- newSchemaRoot = resolveSchema(schemaSource,
fSchemaGrammarDescription, mustResolve, child);
+ newSchemaRoot = resolveSchema(schemaSource,
fSchemaGrammarDescription, mustResolve, child);
schemaNamespace = currSchemaInfo.fTargetNamespace;
if (fSchemaVersion == Constants.SCHEMA_VERSION_1_1) {
- if (isOverride && newSchemaRoot != null) {
+ if (isOverride && newSchemaRoot != null &&
schemaSource.getSystemId() != "") {
final Element transformedSchemaRoot = (Element)
fOverrideHandler.transform(schemaId, child, newSchemaRoot);
// Either we had a collision where the transformed
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
