From 0083f34ba384c4a920fd1be8978636f5013a4dce Mon Sep 17 00:00:00 2001
From: David Abram Cargill <cargilld@apache.org>
Date: Thu, 28 Jul 2005 13:52:00 +0000
Subject: [PATCH] Follow-up fix to xercesc-990. Allow lookup for imported
schema with no namespace.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@225771 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/validators/schema/TraverseSchema.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/xercesc/validators/schema/TraverseSchema.cpp b/src/xercesc/validators/schema/TraverseSchema.cpp
index c1f99a19c..1ad81244e 100644
--- a/src/xercesc/validators/schema/TraverseSchema.cpp
+++ b/src/xercesc/validators/schema/TraverseSchema.cpp
@@ -4785,7 +4785,7 @@ TraverseSchema::getDatatypeValidator(const XMLCh* const uriStr,
fBuffer.append(chComma);
fBuffer.append(localPartStr);
- if ((uriStr && *uriStr) && !XMLString::equals(uriStr, fTargetNSURIString)) {
+ if ((uriStr) && !XMLString::equals(uriStr, fTargetNSURIString)) {
Grammar* grammar = fGrammarResolver->getGrammar(uriStr);
@@ -5138,7 +5138,7 @@ TraverseSchema::checkTypeFromAnotherSchema(const DOMElement* const elem,
if (!XMLString::equals(typeURI, fTargetNSURIString)
&& !XMLString::equals(typeURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA)
- && (typeURI && *typeURI)) {
+ ) {
return typeURI;
}
@@ -5158,7 +5158,7 @@ TraverseSchema::getElementTypeValidator(const DOMElement* const elem,
SchemaInfo* saveInfo = fSchemaInfo;
int saveScope = fCurrentScope;
- if (otherSchemaURI != 0) {
+ if (otherSchemaURI && *otherSchemaURI) {
// Make sure that we have an explicit import statement.
// Clause 4 of Schema Representation Constraint:
--
GitLab