src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java

*** 1,8 ****
  /*
   * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
!  * @LastModified: Oct 2017
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
--- 1,8 ----
  /*
   * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
!  * @LastModified: Nov 2017
   */
  /*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.
*** 1929,1939 ****
      Augmentations augs) throws XNIException {
  
          if (DEBUG_EVENTS) {
              System.out.println ("==>internalEntityDecl: "+name);
              if (DEBUG_BASEURI) {
!                 System.out.println ("   baseURI:"+ (String)fBaseURIStack.peek ());
              }
          }
          // internal subset string
          if (fInternalSubset != null && !fInDTDExternalSubset) {
              fInternalSubset.append ("<!ENTITY ");
--- 1929,1939 ----
      Augmentations augs) throws XNIException {
  
          if (DEBUG_EVENTS) {
              System.out.println ("==>internalEntityDecl: "+name);
              if (DEBUG_BASEURI) {
!                 System.out.println ("   baseURI:"+ fBaseURIStack.peek ());
              }
          }
          // internal subset string
          if (fInternalSubset != null && !fInDTDExternalSubset) {
              fInternalSubset.append ("<!ENTITY ");
*** 1964,1974 ****
          if (fDocumentType != null) {
              NamedNodeMap entities = fDocumentType.getEntities ();
              EntityImpl entity = (EntityImpl)entities.getNamedItem (name);
              if (entity == null) {
                  entity = (EntityImpl)fDocumentImpl.createEntity (name);
!                 entity.setBaseURI ((String)fBaseURIStack.peek ());
                  entities.setNamedItem (entity);
              }
          }
  
          // create deferred node
--- 1964,1974 ----
          if (fDocumentType != null) {
              NamedNodeMap entities = fDocumentType.getEntities ();
              EntityImpl entity = (EntityImpl)entities.getNamedItem (name);
              if (entity == null) {
                  entity = (EntityImpl)fDocumentImpl.createEntity (name);
!                 entity.setBaseURI (fBaseURIStack.peek ());
                  entities.setNamedItem (entity);
              }
          }
  
          // create deferred node
*** 1986,1996 ****
                  }
                  node = fDeferredDocumentImpl.getRealPrevSibling (node, false);
              }
              if (!found) {
                  int entityIndex =
!                 fDeferredDocumentImpl.createDeferredEntity (name, null, null, null, (String)fBaseURIStack.peek ());
                  fDeferredDocumentImpl.appendChild (fDocumentTypeIndex, entityIndex);
              }
          }
  
      } // internalEntityDecl(String,XMLString,XMLString)
--- 1986,1996 ----
                  }
                  node = fDeferredDocumentImpl.getRealPrevSibling (node, false);
              }
              if (!found) {
                  int entityIndex =
!                 fDeferredDocumentImpl.createDeferredEntity (name, null, null, null, fBaseURIStack.peek ());
                  fDeferredDocumentImpl.appendChild (fDocumentTypeIndex, entityIndex);
              }
          }
  
      } // internalEntityDecl(String,XMLString,XMLString)