cvs commit: xml-xalan/c/src/XSLT Stylesheet.cpp

[dbertoni]

dbertoni    01/02/13 15:52:45

  Modified:    c/src/XSLT Stylesheet.cpp
  Log:
  Catch XMLExceptions when trying to resolve the base identifier to a full 
URL.. This is to accomodate stream input sources.
  
  Revision  Changes    Path
  1.48      +14 -3     xml-xalan/c/src/XSLT/Stylesheet.cpp
  
  Index: Stylesheet.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Stylesheet.cpp    2001/01/26 21:19:18     1.47
  +++ Stylesheet.cpp    2001/02/13 23:52:43     1.48
  @@ -157,11 +157,22 @@
        }
        else
        {
  -             const XalanDOMString urlString = 
constructionContext.getURLStringFromString(m_baseIdent);
  +             try
  +             {
  +                     const XalanDOMString urlString = 
constructionContext.getURLStringFromString(m_baseIdent);
   
  -             if (length(urlString) != 0)
  +                     if (length(urlString) != 0)
  +                     {
  +                             m_includeStack.push_back(urlString);
  +                     }
  +             }
  +             catch(const XMLException&       e)
                {
  -                     m_includeStack.push_back(urlString);
  +                     // Assume that any exception here relates to get the 
urlString from
  +                     // m_baseIdent.  We'll assume that it's just a fake 
base identifier
  +                     // since the parser will throw the real error if the 
base identifier
  +                     // can't be resolved.
  +                     m_includeStack.push_back(baseIdentifier);
                }
        }
   }