You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/03/21 16:55:56 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/framework XMLDTDScanner.java

neilg       01/03/21 07:55:53

  Modified:    java/src/org/apache/xerces/framework XMLDTDScanner.java
  Log:
  apply fix for bug #845 from Henry Zongaro.
  
  Revision  Changes    Path
  1.18      +3 -2      xml-xerces/java/src/org/apache/xerces/framework/XMLDTDScanner.java
  
  Index: XMLDTDScanner.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/XMLDTDScanner.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XMLDTDScanner.java	2000/12/06 22:14:34	1.17
  +++ XMLDTDScanner.java	2001/03/21 15:55:44	1.18
  @@ -90,7 +90,7 @@
    * </ol>
    *
    * @see XMLDTDScanner.EventHandler
  - * @version $Id: XMLDTDScanner.java,v 1.17 2000/12/06 22:14:34 lehors Exp $
  + * @version $Id: XMLDTDScanner.java,v 1.18 2001/03/21 15:55:44 neilg Exp $
    */
   public final class XMLDTDScanner {
       //
  @@ -1397,7 +1397,8 @@
           while (fScannerState == SCANNER_STATE_MARKUP_DECL) {
   
               boolean newParseTextDecl = false;
  -            if (!extSubset && fEntityReader.lookingAtChar(']', false)) {
  +            if (fEntityReader.lookingAtChar(']', false) &&
  +                !getReadingExternalEntity()) {
                   int subsetLength = fEntityReader.currentOffset() - subsetOffset;
                   int internalSubset = fEntityReader.addString(subsetOffset, subsetLength);
                   fDTDGrammar.internalSubset(internalSubset);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org