Author: mukulg
Date: Wed Apr 13 12:00:52 2022
New Revision: 1899808
URL: http://svn.apache.org/viewvc?rev=1899808&view=rev
Log:
xercesj commit : cosmetic improvements to codebase
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertXPath2EngineImpl.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertXPath2EngineImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertXPath2EngineImpl.java?rev=1899808&r1=1899807&r2=1899808&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertXPath2EngineImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertXPath2EngineImpl.java
Wed Apr 13 12:00:52 2022
@@ -703,11 +703,14 @@ public class XMLAssertXPath2EngineImpl e
for (int memberTypeIdx = 0; memberTypeIdx < memberTypes.getLength();
memberTypeIdx++) {
XSSimpleTypeDefinition memType = (XSSimpleTypeDefinition)
memberTypes.item(memberTypeIdx);
- if
(!SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(memType.getNamespace()) &&
!XS11TypeHelper.simpleTypeHasAsserts(memType) &&
XS11TypeHelper.isStrValueValidForASimpleType(value, (XSSimpleType)memType,
Constants.SCHEMA_VERSION_1_1)) {
+ if
(!SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(memType.getNamespace()) &&
!XS11TypeHelper.simpleTypeHasAsserts(memType)
+ &&
XS11TypeHelper.isStrValueValidForASimpleType(value, (XSSimpleType)memType,
+
Constants.SCHEMA_VERSION_1_1)) {
isValidationFailedForUnion = false;
break;
}
- else if
(SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(memType.getNamespace()) &&
XS11TypeHelper.isStrValueValidForASimpleType(value, (XSSimpleType)memType,
Constants.SCHEMA_VERSION_1_1)) {
+ else if
(SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(memType.getNamespace()) &&
XS11TypeHelper.isStrValueValidForASimpleType(value,
+
(XSSimpleType)memType, Constants.SCHEMA_VERSION_1_1)) {
isValidationFailedForUnion = false;
break;
}
@@ -732,7 +735,8 @@ public class XMLAssertXPath2EngineImpl e
}
}
if (assertsSucceeded == assertFacets.size()) {
- // all assertions on a 'union' member type have
evaluated to 'true', therefore validation with union has succeeded wrt
assertions.
+ // all assertions on a 'union' member type have
evaluated to 'true', therefore
+ // validation with union has succeeded wrt assertions.
if (!isAssertEvaluationFromSchema) {
// update memberType PSVI property
ItemPSVI elemPSVI =
(ItemPSVI)augs.getItem(Constants.ELEMENT_PSVI);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
