cvs commit: xml-xalan/src/org/apache/xalan/xslt FuncDocument.java XSLTEngineImpl.java

[mmidy]

mmidy       00/10/13 14:08:55

  Modified:    src/org/apache/xalan/xslt FuncDocument.java
                        XSLTEngineImpl.java
  Log:
  Make sure document urls are put into the documents table properly
  
  Revision  Changes    Path
  1.19      +1 -1      xml-xalan/src/org/apache/xalan/xslt/FuncDocument.java
  
  Index: FuncDocument.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/FuncDocument.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FuncDocument.java 2000/10/12 20:52:53     1.18
  +++ FuncDocument.java 2000/10/13 21:08:50     1.19
  @@ -256,7 +256,7 @@
                                
             if(!doc_cache_off)
             {
  -            execContext.getSourceDocsTable().put(uri, newDoc);
  +            execContext.getSourceDocsTable().put(url.toString(), newDoc);
             }
             else
             {
  
  
  
  1.77      +4 -0      xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java
  
  Index: XSLTEngineImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- XSLTEngineImpl.java       2000/10/13 14:39:12     1.76
  +++ XSLTEngineImpl.java       2000/10/13 21:08:51     1.77
  @@ -913,6 +913,8 @@
           if(null != m_diagnosticsPrintWriter)
             displayDuration("Parse of "+xmlIdentifier, xmlIdentifier);
           sourceTree = m_parserLiaison.getDocument();
  +                             if(null != getSourceDocsTable()  && (null != 
inputSource.getSystemId()))
  +                                     
getSourceDocsTable().put(inputSource.getSystemId(), sourceTree);
         }
         catch(Exception e)
         {
  @@ -969,6 +971,8 @@
       {
         doc = docToRegister;
       }
  +             if((null != doc) && (null != getSourceDocsTable()))
  +                     getSourceDocsTable().put(url, doc);
       return doc;
     }