Author: mukulg
Date: Fri Mar 23 07:59:16 2012
New Revision: 1304218
URL: http://svn.apache.org/viewvc?rev=1304218&view=rev
Log:
fixing an NPE error reported by Jorge Williams on "xerces users" list.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=1304218&r1=1304217&r2=1304218&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Fri Mar 23 07:59:16 2012
@@ -2596,7 +2596,10 @@ public class XMLSchemaValidator
private XSElementDecl findLocallyDeclaredType(QName element,
XSCMValidator currentCM, XSTypeDefinition baseType) {
- XSElementDecl elemDecl = currentCM.findMatchingElemDecl(element,
fSubGroupHandler);
+ XSElementDecl elemDecl = null;
+ if (currentCM != null) {
+ elemDecl = currentCM.findMatchingElemDecl(element,
fSubGroupHandler);
+ }
if (elemDecl == null) {
if (baseType.getTypeCategory() != XSTypeDefinition.SIMPLE_TYPE &&
baseType != SchemaGrammar.getXSAnyType(fSchemaVersion)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
