Return-Path: Delivered-To: apmail-xml-xalan-cvs-archive@xml.apache.org Received: (qmail 97177 invoked by uid 500); 3 Nov 2002 03:32:31 -0000 Mailing-List: contact xalan-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: Delivered-To: mailing list xalan-cvs@xml.apache.org Received: (qmail 97166 invoked from network); 3 Nov 2002 03:32:31 -0000 Date: 3 Nov 2002 03:32:29 -0000 Message-ID: <20021103033229.56708.qmail@icarus.apache.org> From: dbertoni@apache.org To: xml-xalan-cvs@apache.org Subject: cvs commit: xml-xalan/c/src/XPath XalanQNameByValue.cpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2002/11/02 19:32:29 Modified: c/src/XPath XalanQNameByValue.cpp Log: Simplified logic. Revision Changes Path 1.8 +15 -13 xml-xalan/c/src/XPath/XalanQNameByValue.cpp Index: XalanQNameByValue.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByValue.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- XalanQNameByValue.cpp 21 Sep 2002 01:24:21 -0000 1.7 +++ XalanQNameByValue.cpp 3 Nov 2002 03:32:29 -0000 1.8 @@ -318,23 +318,25 @@ if(::equals(m_localpart, DOMServices::s_XMLNamespace)) { ::clear(m_localpart); - - return; - } - - const XalanDOMString* const theNamespace = - getNamespaceForPrefix(namespaces, m_localpart); - - if(theNamespace == 0 || 0 == length(*theNamespace)) - { - throwException(TranscodeFromLocalCodePage("Prefix must resolve to a namespace: ") + m_localpart, locator); } else { - m_namespace = *theNamespace; - } + const XalanDOMString* const theNamespace = + getNamespaceForPrefix(namespaces, m_localpart); - m_localpart.assign(qname + indexOfNSSep + 1); + if(theNamespace == 0 || 0 == length(*theNamespace)) + { + throwException( + TranscodeFromLocalCodePage("Prefix must resolve to a namespace: ") + m_localpart, + locator); + } + else + { + m_namespace = *theNamespace; + } + + m_localpart.assign(qname + indexOfNSSep + 1); + } } else { --------------------------------------------------------------------- To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: xalan-cvs-help@xml.apache.org