svn commit: r225770 - /xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp

[cargilld]

Author: cargilld
Date: Thu Jul 28 06:49:22 2005
New Revision: 225770

URL: http://svn.apache.org/viewcvs?rev=225770&view=rev
Log:
Follow-up fix to xercesc-990.  Allow lookup for imported schema with no 
namespace.

Modified:
    
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp

Modified: 
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp
URL: 
http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp?rev=225770&r1=225769&r2=225770&view=diff
==============================================================================
--- 
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp 
(original)
+++ 
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp 
Thu Jul 28 06:49:22 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]