You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by bi...@apache.org on 2008/11/16 18:34:05 UTC
svn commit: r718067 -
/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
Author: bimargulies
Date: Sun Nov 16 09:34:05 2008
New Revision: 718067
URL: http://svn.apache.org/viewvc?rev=718067&view=rev
Log:
WSCOMMONS-365
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=718067&r1=718066&r2=718067&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java (original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java Sun Nov 16 09:34:05 2008
@@ -1879,6 +1879,10 @@
}
final String systemId = source.getSystemId() == null ? schemaLocation
: source.getSystemId();
+ // Push repaired system id back into source where read sees it.
+ // It is perhaps a bad thing to patch the source, but this fixes
+ // a problem.
+ source.setSystemId(systemId);
final SchemaKey key = new XmlSchemaCollection.SchemaKey(
targetNamespace, systemId);
XmlSchema schema = collection.getSchema(key);
@@ -1916,6 +1920,7 @@
*/
XmlSchema resolveXmlSchema(String targetNamespace, String schemaLocation,
TargetNamespaceValidator validator) {
+
return resolveXmlSchema(targetNamespace, schemaLocation,
collection.baseUri, validator);