Author: frankb
Date: Thu Jul 19 14:37:22 2007
New Revision: 557781
URL: http://svn.apache.org/viewvc?view=rev&rev=557781
Log:
Fix for TUSCANY-1457
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java?view=diff&rev=557781&r1=557780&r2=557781
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
Thu Jul 19 14:37:22 2007
@@ -814,11 +814,14 @@
}
}
}
- EPackage ePackage = extendedMetaData.getPackage(namespaceURI);
- if (ePackage != null)
+ if (namespaceURI != null &&
!namespaceURI.equals(xsdSchema.getTargetNamespace()))
{
- XSDSchema schema = loadEPackage(ePackage);
- return schema;
+ EPackage ePackage = extendedMetaData.getPackage(namespaceURI);
+ if (ePackage != null)
+ {
+ XSDSchema schema = loadEPackage(ePackage);
+ return schema;
+ }
}
return super.locateSchema(xsdSchema, namespaceURI,
rawSchemaLocationURI, resolvedSchemaLocation);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
