Author: mukulg
Date: Sat Jan 15 10:26:57 2011
New Revision: 1059284
URL: http://svn.apache.org/viewvc?rev=1059284&view=rev
Log:
a minor fix for a null pointer error.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaConditionalIncludeHelper.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaConditionalIncludeHelper.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaConditionalIncludeHelper.java?rev=1059284&r1=1059283&r2=1059284&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaConditionalIncludeHelper.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaConditionalIncludeHelper.java
Sat Jan 15 10:26:57 2011
@@ -39,8 +39,7 @@ import org.apache.xerces.xni.QName;
*/
public class SchemaConditionalIncludeHelper {
- // instance variables holding "natively supported" XML Schema types and
- // facets by Xerces-J XML Schema 1.1 engine.
+ // instance variables holding "natively supported" XML Schema types and
facets by Xerces-J XML Schema 1.1 engine.
List typesSupported = null;
List facetsSupported = null;
@@ -217,19 +216,18 @@ public class SchemaConditionalIncludeHel
/*
- * Method to check if a schema type specified by method arguments (the
- * QName components of the schema type) is supported by Xerces-J natively.
- *
+ * Method to check if a schema type specified by method arguments (the
QName components of the schema type) is
+ * supported by Xerces-J natively.
*/
public boolean isTypeSupported(String localName, String uri) {
+
boolean typeSupported = false;
for (Iterator iter = typesSupported.iterator(); iter.hasNext(); ) {
QName typeQname = (QName) iter.next();
- if (localName.equals(typeQname.localpart) && uri.equals
- (typeQname.uri)) {
- typeSupported = true;
- break;
+ if (typeQname.localpart.equals(localName) &&
typeQname.uri.equals(uri)) {
+ typeSupported = true;
+ break;
}
}
@@ -239,19 +237,18 @@ public class SchemaConditionalIncludeHel
/*
- * Method to check if a schema facet specified by method arguments (the
- * QName components of a schema facet) is supported by Xerces-J natively.
- *
+ * Method to check if a schema facet specified by method arguments (the
QName components of a schema facet) is
+ * supported by Xerces-J natively.
*/
public boolean isFacetSupported(String localName, String uri) {
+
boolean facetSupported = false;
for (Iterator iter = facetsSupported.iterator(); iter.hasNext(); ) {
QName typeQname = (QName) iter.next();
- if (localName.equals(typeQname.localpart) && uri.equals
- (typeQname.uri)) {
- facetSupported = true;
- break;
+ if (typeQname.localpart.equals(localName) &&
typeQname.uri.equals(uri)) {
+ facetSupported = true;
+ break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
