--- a/.hgtags	Sat May 02 19:27:58 2020 +0100
+++ b/.hgtags	Sun Jun 21 23:40:11 2020 +0100
@@ -1099,6 +1099,7 @@
 3caad4f1dcbc4aa5265a8ac7d494fc685d1d86c6 jdk8u252-b03
 d71d04eabe6424cb001f59c7448535ce9a8a5d86 jdk8u252-b04
 49013f07f606b0226e8dffe6f3ad865cd100e52e jdk8u252-b05
+49013f07f606b0226e8dffe6f3ad865cd100e52e jdk8u262-b00
 4f24bfe038c3727f560c5eca38a766158037a44b jdk8u252-b06
 ca05e6121665397a1a6a814fdf9fc206a5ecb370 jdk8u252-b07
 d1a8fb9aafdd8a6bfad7ee853e160101dae10787 jdk8u252-b08

--- a/THIRD_PARTY_README	Sat May 02 19:27:58 2020 +0100
+++ b/THIRD_PARTY_README	Sun Jun 21 23:40:11 2020 +0100
@@ -2898,23 +2898,21 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to X Window System 6.8.2, which may be 
+%% This notice is provided with respect to xwd v1.0.7, which may be
 included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
 
+xwd utility
+
 --- begin of LICENSE ---
 
-This is the copyright for the files in src/solaris/native/sun/awt: list.h, 
-multiVis.h, wsutils.h, list.c, multiVis.c
-Copyright (c) 1994 Hewlett-Packard Co.
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright 1994 Hewlett-Packard Co.
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
@@ -2922,15 +2920,15 @@
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of the X Consortium shall
+Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
-from the X Consortium.
+from The Open Group.
 
 --- end of LICENSE ---
 _____________________________

--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Sat May 02 19:27:58 2020 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Sun Jun 21 23:40:11 2020 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -824,7 +824,7 @@
 
         // We've seen a new Reader.
         // Push it on the stack so we can close it later.
-        //fOwnReaders.add(reader);
+        fReaderStack.push(reader);
 
         // push entity on stack
         if (fCurrentEntity != null) {
@@ -1347,16 +1347,21 @@
             (fEntityStack.empty() ? null : fEntityStack.elementAt(0));
     }
 
+    // A stack containing all the open readers
+    protected Stack<Reader> fReaderStack = new Stack<>();
 
     /**
      * Close all opened InputStreams and Readers opened by this parser.
      */
     public void closeReaders() {
-        /** this call actually does nothing, readers are closed in the endEntity method
-         * through the current entity.
-         * The change seems to have happened during the jdk6 development with the
-         * addition of StAX
-        **/
+        // close all readers
+        while (!fReaderStack.isEmpty()) {
+            try {
+                (fReaderStack.pop()).close();
+            } catch (IOException e) {
+                // ignore
+            }
+        }
     }
 
     public void endEntity() throws IOException, XNIException {
@@ -1390,6 +1395,13 @@
             }
         }
 
+        // REVISIT: We should never encounter underflow if the calls
+        // to startEntity and endEntity are balanced, but guard
+        // against the EmptyStackException for now. -- mrglavas
+        if (!fReaderStack.isEmpty()) {
+            fReaderStack.pop();
+        }
+
         if (fEntityHandler != null) {
             //so this is the last opened entity, signal it to current fEntityHandler using Augmentation
             if(entity == null){