You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2005/07/28 15:52:04 UTC
svn commit: r225771 -
/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Author: cargilld
Date: Thu Jul 28 06:52:00 2005
New Revision: 225771
URL: http://svn.apache.org/viewcvs?rev=225771&view=rev
Log:
Follow-up fix to xercesc-990. Allow lookup for imported schema with no namespace.
Modified:
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=225771&r1=225770&r2=225771&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Thu Jul 28 06:52:00 2005
@@ -4785,7 +4785,7 @@
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 @@
if (!XMLString::equals(typeURI, fTargetNSURIString)
&& !XMLString::equals(typeURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA)
- && (typeURI && *typeURI)) {
+ ) {
return typeURI;
}
@@ -5158,7 +5158,7 @@
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:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org