# HG changeset patch
# User Andrew John Hughes
# Date 1546319085 0
# Node ID 2f0ac48fe540fa44f8775747521184fbc351e112
# Parent 53f42b5c6e0c46c6fb3af9092c78156b6450819e
Bump to 2.6.16.
Upstream changes:
- Bump to icedtea-2.6.16
- PR3640, CVE-2018-16435: lcms2: heap-based buffer overflow in SetData function in cmsIT8LoadFromFile
- S7058700: Unexpected exceptions and timeouts in SF2 parser code
- S7098755: test/sun/misc/JarIndex/metaInfFilenames/Basic.java should use supported compiler interface
- S7104650: rawtype warnings in several net, nio and security source files
- S7116722: Miscellaneous warnings sun.misc ( and related classes )
- S7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
- S7142888: sun/security/tools/jarsigner/ec.sh fail on sparc
- S8044860: Vectors and fixed length fields should be verified for allowed sizes.
- S8049834: Two security tools tests do not run with only JRE
- S8054431: Some of the input validation in the javasound is too strict
- S8074462: Handshake messages can be strictly ordered
- S8130132: jarsigner should emit warning if weak algorithms or keysizes are used
- S8142927: Feed some text to STDIN in ProcessTools.executeProcess()
- S8146377: test/sun/security/tools/jarsigner/concise_jarsigner.sh failing
- S8158887: sun/security/tools/jarsigner/concise_jarsigner.sh timed out
- S8164480: Crash with assert(handler_address == SharedRuntime::compute_compiled_exc_handler(..) failed: Must be the same
- S8168405: Pending exceptions in java.base/windows/native
- S8172529: Use PKIXValidator in jarsigner
- S8180289: jarsigner treats timestamped signed jar invalid after the signer cert expires
- S8190674: sun/security/tools/jarsigner/TimestampCheck.java failed with java.nio.file.NoSuchFileException: ts2.cert
- S8193892: Impact of noncloneable MessageDigest implementation
- S8194534: Manifest better support
- S8194546: Choosier FileManagers
- S8195868: Address Internet Addresses
- S8195874: Improve jar specification adherence
- S8196897: Improve PRNG support
- S8196902: Better HTTP redirection support
- S8199177: Enhance JNDI lookups
- S8199226: Improve field accesses
- S8201756: Improve cipher inputs
- S8202613: Improve TLS connections stability
- S8203654: Improve cypher state updates
- S8204497: Better formatting of decimals
- S8204667: Resources not freed on exception
- S8205361: Better RIFF reading support
- S8207336: Build failure in JDK8u on Windows after fix 8207260
- S8208350: Disable all DES cipher suites
- S8208353: Upgrade JDK 8u to libpng 1.6.35
- S8208660: JDK 8u191 l10n resource file update
- S8208754: The fix for JDK-8194534 needs updates
- S8211107: LDAPS communication failure with jdk 1.8.0_181
- S8211731: Reconsider default option for ClassPathURLCheck change done in JDK-8195874
ChangeLog:
2018-12-31 Andrew John Hughes
Bump to 2.6.16.
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-2.6.16.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated. Split previous u191 NEWS items
into individual builds (0, 1 and 2)
* acinclude.m4:
(JDK_UPDATE_VERSION): Bump to 201.
(BUILD_VERSION): Set to b00.
* configure.ac: Bump to 2.6.16.
* hotspot.map.in: Update to icedtea-2.6.16.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new cases in
java.util.jar.JarVerifier,
java.util.jar.Manifest,
java.util.prefs.XmlSupport,
sun.misc.ExtensionDependency,
sun.misc.JarIndex,
sun.misc.ProxyGenerator,
sun.misc.Service,
sun.misc.Signal and
sun.security.ssl.HandshakeStateManager.
* patches/boot/ecj-multicatch.patch:
Add new case in sun.misc.URLClasspath.
* patches/boot/ecj-trywithresources.patch:
Add new case in sun.security.tools.jarsigner.Main.
diff -r 53f42b5c6e0c -r 2f0ac48fe540 ChangeLog
--- a/ChangeLog Mon Dec 31 20:55:14 2018 +0000
+++ b/ChangeLog Tue Jan 01 05:04:45 2019 +0000
@@ -1,3 +1,42 @@
+2018-12-31 Andrew John Hughes
+
+ Bump to 2.6.16.
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to icedtea-2.6.16.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated. Split previous u191 NEWS items
+ into individual builds (0, 1 and 2)
+ * acinclude.m4:
+ (JDK_UPDATE_VERSION): Bump to 201.
+ (BUILD_VERSION): Set to b00.
+ * configure.ac: Bump to 2.6.16.
+ * hotspot.map.in: Update to icedtea-2.6.16.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add new cases in
+ java.util.jar.JarVerifier,
+ java.util.jar.Manifest,
+ java.util.prefs.XmlSupport,
+ sun.misc.ExtensionDependency,
+ sun.misc.JarIndex,
+ sun.misc.ProxyGenerator,
+ sun.misc.Service,
+ sun.misc.Signal and
+ sun.security.ssl.HandshakeStateManager.
+ * patches/boot/ecj-multicatch.patch:
+ Add new case in sun.misc.URLClasspath.
+ * patches/boot/ecj-trywithresources.patch:
+ Add new case in sun.security.tools.jarsigner.Main.
+
2018-12-31 Andrew John Hughes
* NEWS: Add section for 2.6.16.
diff -r 53f42b5c6e0c -r 2f0ac48fe540 Makefile.am
--- a/Makefile.am Mon Dec 31 20:55:14 2018 +0000
+++ b/Makefile.am Tue Jan 01 05:04:45 2019 +0000
@@ -1,18 +1,18 @@
# Dependencies
-CORBA_CHANGESET = 9b8ff44cf2c6
-JAXP_CHANGESET = 5dc90bd920db
-JAXWS_CHANGESET = a88988c07020
-JDK_CHANGESET = 25542ea9adea
-LANGTOOLS_CHANGESET = 5d348df3700d
-OPENJDK_CHANGESET = 02692bca5efc
-
-CORBA_SHA256SUM = dec1790e9aa4f82f8843aa3728e51ca8d054b60bd492dffbe71882b41af5cecd
-JAXP_SHA256SUM = 52e3cef3453d79c0074ccc04d513eac8cc1185d48f62d6e682d3114926cb9e3b
-JAXWS_SHA256SUM = b6a3a00234be8a118d0b94d3e3728b75ef445ff96988cd3eac307e1e7a075c48
-JDK_SHA256SUM = 64ae93c996277292b1f404b1aa645822b75746ce7a03b36e58394eee43ea8dce
-LANGTOOLS_SHA256SUM = c18e8d838deb2c711c92bb93e0cf0ecb1dd22c219524fe2ec18a53c29c4d9728
-OPENJDK_SHA256SUM = 852962fd4397e069dde62a3bd5cbf747a8f268c18ab37a66ae2454b94d65a004
+CORBA_CHANGESET = f6cd5cd93391
+JAXP_CHANGESET = f331098c637a
+JAXWS_CHANGESET = 234f51a5ed7a
+JDK_CHANGESET = b624599b602c
+LANGTOOLS_CHANGESET = 1b532e3cc1da
+OPENJDK_CHANGESET = d44eff7de671
+
+CORBA_SHA256SUM = 7282d3365f1c23e2ef7abb0bef755842fb5c4b432eabfc3c583da9ef73190bca
+JAXP_SHA256SUM = bdbc4ebd85fe45f50e254bb93bc0754270a3567c84c55ef20decbae9563642d6
+JAXWS_SHA256SUM = d5d678f07fb86e7511e9d11cd8ff9bf9380d3477d12eb8c07b664d88a9de3ae2
+JDK_SHA256SUM = a8b10b885b7763d87fd0cbb5158c42267d25763ac6f902a5f121ddd28d774a76
+LANGTOOLS_SHA256SUM = e5b946f06b48b3c284a881a3c5f8da6fc12353d7ae0522a0f04503f0e4ad7402
+OPENJDK_SHA256SUM = 6877453ada333164528b640c688922886579214ec8eab0b026fb710bd656cdde
DROP_URL = http://icedtea.classpath.org/download/drops
diff -r 53f42b5c6e0c -r 2f0ac48fe540 NEWS
--- a/NEWS Mon Dec 31 20:55:14 2018 +0000
+++ b/NEWS Tue Jan 01 05:04:45 2019 +0000
@@ -14,6 +14,51 @@
New in release 2.6.16 (2018-12-31):
+* Security fixes
+ - S8194534, CVE-2018-3136: Manifest better support
+ - S8194546: Choosier FileManagers
+ - S8195868: Address Internet Addresses
+ - S8195874: Improve jar specification adherence
+ - S8196897: Improve PRNG support
+ - S8196902, CVE-2018-3139: Better HTTP redirection support
+ - S8199177, CVE-2018-3149: Enhance JNDI lookups
+ - S8199226, CVE-2018-3169: Improve field accesses
+ - S8201756: Improve cipher inputs
+ - S8202613, CVE-2018-3180: Improve TLS connections stability
+ - S8203654: Improve cypher state updates
+ - S8204497: Better formatting of decimals
+ - S8205361, CVE-2018-3214: Better RIFF reading support
+ - S8208353, CVE-2018-13785: Upgrade JDK 8u to libpng 1.6.35
+ - PR3640, CVE-2018-16435: lcms2: heap-based buffer overflow in SetData function in cmsIT8LoadFromFile
+* Import of OpenJDK 7 u201 build 0
+ - S7058700: Unexpected exceptions and timeouts in SF2 parser code
+ - S7098755: test/sun/misc/JarIndex/metaInfFilenames/Basic.java should use supported compiler interface
+ - S7104650: rawtype warnings in several net, nio and security source files
+ - S7116722: Miscellaneous warnings sun.misc ( and related classes )
+ - S7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
+ - S7142888: sun/security/tools/jarsigner/ec.sh fail on sparc
+ - S8044860: Vectors and fixed length fields should be verified for allowed sizes.
+ - S8049834: Two security tools tests do not run with only JRE
+ - S8054431: Some of the input validation in the javasound is too strict
+ - S8074462: Handshake messages can be strictly ordered
+ - S8130132: jarsigner should emit warning if weak algorithms or keysizes are used
+ - S8142927: Feed some text to STDIN in ProcessTools.executeProcess()
+ - S8146377: test/sun/security/tools/jarsigner/concise_jarsigner.sh failing
+ - S8158887: sun/security/tools/jarsigner/concise_jarsigner.sh timed out
+ - S8164480: Crash with assert(handler_address == SharedRuntime::compute_compiled_exc_handler(..) failed: Must be the same
+ - S8168405: Pending exceptions in java.base/windows/native
+ - S8172529: Use PKIXValidator in jarsigner
+ - S8180289: jarsigner treats timestamped signed jar invalid after the signer cert expires
+ - S8190674: sun/security/tools/jarsigner/TimestampCheck.java failed with java.nio.file.NoSuchFileException: ts2.cert
+ - S8193892: Impact of noncloneable MessageDigest implementation
+ - S8204667: Resources not freed on exception
+ - S8207336: Build failure in JDK8u on Windows after fix 8207260
+ - S8208350: Disable all DES cipher suites
+ - S8208660: JDK 8u191 l10n resource file update
+ - S8208754: The fix for JDK-8194534 needs updates
+ - S8211107: LDAPS communication failure with jdk 1.8.0_181
+ - S8211731: Reconsider default option for ClassPathURLCheck change done in JDK-8195874
+
New in release 2.6.15 (2018-12-31):
* Security fixes
@@ -28,7 +73,7 @@
- PR3629: Install symlinks to tapsets in SystemTap directory
- PR3657: Sync desktop files with Fedora/RHEL versions again
- PR3659: Support RHEL multilib installations which use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
-* Import of OpenJDK 7 u191 build 2
+* Import of OpenJDK 7 u191 build 0
- S8005661: [parfait] Possible buffer overrun in jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
- S8005695: [parfait] Format string argument mismatch in jdk/src/solaris/native/sun/xawt/XToolkit.c
- S8005752: [parfait] False positive function call mismatch at jdk/src/solaris/native/sun/xawt/XWindow.c
@@ -36,6 +81,10 @@
- S8034857: gcc warnings compiling src/solaris/native/sun/management
- S8035054: JarFacade.c should not include ctype.h
- S8035287: gcc warnings compiling various libraries files
+ - S8203182: Release session if initialization of SunPKCS11 Signature fails
+ - S8205491: adjust reflective access checks
+ - S8205587, PR3606: Implicit function declaration in jni_util.c
+* Import of OpenJDK 7 u191 build 1
- S8051972: sun/security/pkcs11/ec/ReadCertificates.java fails intermittently
- S8076117: EndEntityChecker should not process custom extensions after PKIX validation
- S8157898: SupportedDSAParamGen.java failed with timeout
@@ -49,11 +98,9 @@
- S8201433: Fix potential crash in BufImg_SetupICM
- S8202585: JDK 8u181 l10n resource file update
- S8202996: Remove debug print statements from RMI fix
- - S8203182: Release session if initialization of SunPKCS11 Signature fails
- S8203233: (tz) Upgrade time-zone data to tzdata2018e
- S8203368: ObjectInputStream filterCheck method throws NullPointerException
- - S8205491: adjust reflective access checks
- - S8205587, PR3606: Implicit function declaration in jni_util.c
+* Import of OpenJDK 7 u191 build 2
- S8207151, PR3604: Frequent JVM Crash SIGSEGV same stacktrace location during tomcat start with hibernate init on 7u181-2.6.14-0ubuntu0.1
* Backports
- S8075942, PR3605: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
diff -r 53f42b5c6e0c -r 2f0ac48fe540 acinclude.m4
--- a/acinclude.m4 Mon Dec 31 20:55:14 2018 +0000
+++ b/acinclude.m4 Tue Jan 01 05:04:45 2019 +0000
@@ -2948,8 +2948,8 @@
AC_MSG_CHECKING([which branch and release of IcedTea is being built])
JAVA_VER=1.7.0
JAVA_VENDOR=openjdk
- JDK_UPDATE_VERSION=191
- BUILD_VERSION=b02
+ JDK_UPDATE_VERSION=201
+ BUILD_VERSION=b00
COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION}
OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION}
ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##')
diff -r 53f42b5c6e0c -r 2f0ac48fe540 configure.ac
--- a/configure.ac Mon Dec 31 20:55:14 2018 +0000
+++ b/configure.ac Tue Jan 01 05:04:45 2019 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.16pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.16], [distro-pkg-dev@openjdk.java.net])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
diff -r 53f42b5c6e0c -r 2f0ac48fe540 hotspot.map.in
--- a/hotspot.map.in Mon Dec 31 20:55:14 2018 +0000
+++ b/hotspot.map.in Tue Jan 01 05:04:45 2019 +0000
@@ -1,2 +1,2 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ e200fdadc487 95b6a334504cf7a6a67dfddc0e687c2b8a4920e68ca6a69090aed925057b1d58
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ ae6068b02261 00b4e52663c08fca87e9c9c625e296e6a42dda35da2852ec021994a28527c50b
diff -r 53f42b5c6e0c -r 2f0ac48fe540 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Mon Dec 31 20:55:14 2018 +0000
+++ b/patches/boot/ecj-diamond.patch Tue Jan 01 05:04:45 2019 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2018-10-22 06:22:47.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2018-12-31 21:21:58.984052201 +0000
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2018-05-20 04:38:34.416808053 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2018-12-31 21:17:36.548170429 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2018-12-31 21:21:58.984052201 +0000
@@ -481,7 +481,7 @@
while (cls != fnscl) {
ProtectionDomain pd = cls.getProtectionDomain();
@@ -32,8 +32,8 @@
pds.add(noPermissionsDomain());
break;
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2018-10-22 06:22:47.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2018-12-31 21:21:58.984052201 +0000
@@ -50,7 +50,7 @@
*/
private class HookPutFields extends ObjectOutputStream.PutField
@@ -44,8 +44,8 @@
/**
* Put the value of the named boolean field into the persistent field.
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2018-10-22 06:22:47.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2018-12-31 21:21:58.984052201 +0000
@@ -103,7 +103,7 @@
Set _iorTypeNames = null;
if (filterProperty != null) {
@@ -74,8 +74,8 @@
}
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2018-10-22 06:22:47.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2018-12-31 21:21:58.988052139 +0000
@@ -1323,7 +1323,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set oaset;
@@ -86,8 +86,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2018-10-22 06:22:47.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2018-12-31 21:21:58.988052139 +0000
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -107,8 +107,8 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2018-12-31 21:21:58.988052139 +0000
@@ -192,7 +192,7 @@
NodeSet dist = new NodeSet();
dist.setShouldCacheNodes(true);
@@ -119,8 +119,8 @@
for (int i = 0; i < nl.getLength(); i++)
{
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2018-12-31 21:21:58.988052139 +0000
@@ -420,7 +420,7 @@
}
@@ -131,8 +131,8 @@
/**
* Prints out warnings if a parser does not support the specified feature/property.
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2018-12-31 21:21:58.988052139 +0000
@@ -220,7 +220,7 @@
public Map getEnvironmentHash()
{
@@ -251,8 +251,8 @@
jarVersions.put(new Long(440237), "xalan.jar from xalan-j_1_2");
jarVersions.put(new Long(436094), "xalan.jar from xalan-j_1_2_1");
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2018-12-31 21:21:58.988052139 +0000
@@ -51,7 +51,7 @@
/**
* Legal conversions between internal types.
@@ -263,8 +263,8 @@
static {
// Possible type conversions between internal types
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2018-05-20 04:52:08.123913888 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2018-12-31 21:21:58.988052139 +0000
@@ -139,7 +139,7 @@
private boolean _isStatic = false;
@@ -288,8 +288,8 @@
// Possible conversions between Java and internal types
java2Internal.put(Boolean.TYPE, Type.Boolean);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2018-12-31 21:21:58.988052139 +0000
@@ -107,7 +107,7 @@
// Check if we have any declared namespaces
@@ -336,8 +336,8 @@
SyntaxTreeNode n = _attributeElements.get(k);
if (n instanceof LiteralAttribute) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2018-12-31 21:21:58.988052139 +0000
@@ -129,22 +129,22 @@
/**
* A mapping between templates and test sequences.
@@ -390,8 +390,8 @@
_rootPattern = null;
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2018-12-31 21:21:58.988052139 +0000
@@ -102,11 +102,11 @@
}
@@ -428,8 +428,8 @@
_prefixMapping.put(prefix, uri);
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2018-12-31 21:21:58.988052139 +0000
@@ -122,7 +122,7 @@
/**
* Mapping between mode names and Mode instances.
@@ -458,8 +458,8 @@
/**
* A reference to the SourceLoader set by the user (a URIResolver
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2018-12-31 21:21:58.988052139 +0000
@@ -38,8 +38,8 @@
final class SymbolTable {
@@ -542,8 +542,8 @@
// Register the namespace URI
Integer refcnt = _excludedURI.get(uri);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2018-12-31 21:21:58.988052139 +0000
@@ -70,7 +70,7 @@
protected SyntaxTreeNode _parent; // Parent node
private Stylesheet _stylesheet; // Stylesheet ancestor node
@@ -572,8 +572,8 @@
locals.add(varOrParamName);
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2018-12-31 21:21:58.988052139 +0000
@@ -127,7 +127,7 @@
* times. Note that patterns whose kernels are "*", "node()"
* and "@*" can between shared by test sequences.
@@ -584,8 +584,8 @@
public MethodGenerator(int access_flags, Type return_type,
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2018-12-31 21:21:58.988052139 +0000
@@ -37,7 +37,7 @@
public final class MultiHashtable {
static final long serialVersionUID = -6151608290510033572L;
@@ -605,8 +605,8 @@
}
set.add(value);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2018-12-31 21:21:58.988052139 +0000
@@ -171,7 +171,7 @@
_parser = new Parser(this, _overrideDefaultParser);
_xmlFeatures = featureManager;
@@ -635,8 +635,8 @@
_parser.init();
//_variableSerial = 1;
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2018-12-31 21:21:58.988052139 +0000
@@ -169,7 +169,7 @@
_count = 0;
_current = 0;
@@ -647,8 +647,8 @@
try {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2018-12-31 21:21:58.988052139 +0000
@@ -60,7 +60,7 @@
*/
public DOMWSFilter(AbstractTranslet translet) {
@@ -659,8 +659,8 @@
if (translet instanceof StripFilter) {
m_filter = (StripFilter) translet;
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2018-12-31 21:21:58.992052076 +0000
@@ -59,7 +59,7 @@
/**
* A mapping from a document node to the mapping between values and nodesets
@@ -689,8 +689,8 @@
} else {
nodes = index.get(id);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2018-12-31 21:21:58.992052076 +0000
@@ -56,7 +56,7 @@
private int _free;
private int _size;
@@ -701,8 +701,8 @@
private final class AxisIterator extends DTMAxisIteratorBase {
// constitutive data
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -114,7 +114,7 @@
private int _namesSize = -1;
@@ -722,8 +722,8 @@
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2018-05-20 04:52:08.127913824 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2018-12-31 21:21:58.992052076 +0000
@@ -279,7 +279,7 @@
*/
public void addDecimalFormat(String name, DecimalFormatSymbols symbols) {
@@ -752,8 +752,8 @@
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2018-12-31 21:21:58.992052076 +0000
@@ -58,7 +58,7 @@
private ContentHandler _sax = null;
private LexicalHandler _lex = null;
@@ -764,8 +764,8 @@
public DOM2SAX(Node root) {
_dom = root;
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -407,7 +407,7 @@
_class = new Class[classCount];
@@ -776,8 +776,8 @@
for (int i = 0; i < classCount; i++) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -1180,7 +1180,7 @@
if (_isIdentity) {
@@ -788,8 +788,8 @@
_parameters.put(name, value);
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -393,7 +393,7 @@
if (identifiers != null) {
@@ -891,8 +891,8 @@
}
} // class CoreDocumentImpl
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -2059,7 +2059,7 @@
// create Map
@@ -903,8 +903,8 @@
// save ID and its associated element
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -249,7 +249,7 @@
filter,
entityReferenceExpansion);
@@ -996,8 +996,8 @@
}
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -478,7 +478,7 @@
public Object setUserData(String key,
Object data, UserDataHandler handler) {
@@ -1025,8 +1025,8 @@
}
} // class DocumentTypeImpl
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2018-12-31 21:21:58.992052076 +0000
@@ -37,7 +37,7 @@
class LCount
@@ -1037,8 +1037,8 @@
static LCount lookup(String evtName)
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2018-12-31 21:21:58.992052076 +0000
@@ -62,7 +62,7 @@
/** Default constructor. */
@@ -1049,8 +1049,8 @@
//
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2018-12-31 21:21:58.992052076 +0000
@@ -210,13 +210,13 @@
// other information
@@ -1078,8 +1078,8 @@
/** Children content model operation stack. */
private short[] fOpStack = null;
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -38,7 +38,7 @@
static final Map fBuiltInTypes;
@@ -1099,8 +1099,8 @@
}// DTDDVFactoryImpl
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2018-12-31 21:21:58.992052076 +0000
@@ -37,7 +37,7 @@
static Map XML11BUILTINTYPES;
@@ -1120,8 +1120,8 @@
return toReturn;
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2018-12-31 21:21:58.996052014 +0000
@@ -364,7 +364,7 @@
// entities
@@ -1132,8 +1132,8 @@
/** Entity stack. */
protected Stack fEntityStack = new Stack();
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2018-05-20 04:52:08.131913761 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2018-12-31 21:21:58.996052014 +0000
@@ -192,7 +192,7 @@
// caller to specify the location of the error being
// reported. -Ac
@@ -1144,8 +1144,8 @@
} // ()
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2018-12-31 21:21:58.996052014 +0000
@@ -374,8 +374,8 @@
static private Map ranges2 = null;
static synchronized protected RangeToken getRange(String name, boolean positive) {
@@ -1158,8 +1158,8 @@
Token tok = Token.createRange();
setupRange(tok, SPACES);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2018-12-31 21:21:58.996052014 +0000
@@ -593,8 +593,8 @@
}
@@ -1199,8 +1199,8 @@
}
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2018-12-31 21:21:58.996052014 +0000
@@ -859,10 +859,10 @@
private SymbolTable fSymbolTable;
@@ -1215,8 +1215,8 @@
/**
* Current position in the token list.
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2018-12-31 21:21:58.996052014 +0000
@@ -176,10 +176,10 @@
// - a Vector, which contains all elements that has this element as their
// substitution group affilication
@@ -1231,8 +1231,8 @@
/**
* clear the internal registry of substitutionGroup information
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2018-12-31 21:21:58.996052014 +0000
@@ -463,7 +463,7 @@
// Constructors
@@ -1243,8 +1243,8 @@
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2018-12-31 21:21:58.996052014 +0000
@@ -490,7 +490,7 @@
/** Schema Grammar Description passed, to give a chance to application to supply the Grammar */
@@ -1276,8 +1276,8 @@
//
// Constructors
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2018-12-31 21:21:58.996052014 +0000
@@ -102,7 +102,7 @@
// Create the Map if none existed before
@@ -1297,8 +1297,8 @@
// If this is the secure processing feature, save it then return.
if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2018-12-31 21:21:58.996052014 +0000
@@ -186,7 +186,7 @@
private void putInFeatures(String name, boolean value){
@@ -1309,8 +1309,8 @@
features.put(name, value ? Boolean.TRUE : Boolean.FALSE);
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2018-12-31 21:21:58.996052014 +0000
@@ -85,7 +85,7 @@
private static final Map KNOWN_LOADERS;
@@ -1330,8 +1330,8 @@
setLocale(Locale.getDefault());
fEntityResolver = new XMLEntityManager();
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2018-12-31 21:21:58.996052014 +0000
@@ -241,7 +241,7 @@
}
@@ -1342,8 +1342,8 @@
public Object getItem(Object key) {
return fAugmentations.get(key);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2018-12-31 21:21:58.996052014 +0000
@@ -294,7 +294,7 @@
// REVISIT: do well-formedness issues involving XML declaration need to be added to hash table (no XML declaration node in DOM, but Document includes xmlEncoding, xmlStandalone, xmlVersion, etc.
@@ -1354,8 +1354,8 @@
aDOMErrorTypeTable.put(new XMLErrorCode(XMLMessageFormatter.XML_DOMAIN, "InvalidCharInContent"), "wf-invalid-character");
aDOMErrorTypeTable.put(new XMLErrorCode(XMLMessageFormatter.XML_DOMAIN, "TwoColonsInQName"), "wf-invalid-character-in-node-name");
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2018-12-31 21:21:58.996052014 +0000
@@ -489,8 +489,8 @@
//
@@ -1368,8 +1368,8 @@
// add IANA to Java encoding mappings.
aIANA2JavaMap.put("BIG5", "Big5");
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2018-05-20 04:52:08.135913698 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2018-12-31 21:21:58.996052014 +0000
@@ -144,7 +144,7 @@
Map cache;
@@ -1380,8 +1380,8 @@
} else {
cache = caches[index];
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2018-12-31 21:21:59.000051950 +0000
@@ -502,7 +502,7 @@
}
@@ -1392,8 +1392,8 @@
/**
* Prints out warnings if a parser does not support the specified feature/property.
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2018-12-31 21:21:59.000051950 +0000
@@ -47,7 +47,7 @@
*/
public class CustomStringPool extends DTMStringPool {
@@ -1404,8 +1404,8 @@
public CustomStringPool() {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2018-12-31 21:21:59.000051950 +0000
@@ -162,7 +162,7 @@
* This table holds the ID string to node associations, for
* XML IDs.
@@ -1416,8 +1416,8 @@
/**
* fixed dom-style names.
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2018-12-31 21:21:59.000051950 +0000
@@ -59,7 +59,7 @@
* (e.g., 'BASE' or 'SYSTEM') to their type (1, 2, etc.).
* Names are case sensitive.
@@ -1428,8 +1428,8 @@
/** The entryTypes vector maps catalog entry types to the
number of arguments they're required to have. */
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2018-12-31 21:21:59.000051950 +0000
@@ -341,7 +341,7 @@
* vector. This allows the Catalog to quickly locate the reader
* for a particular MIME type.
@@ -1440,8 +1440,8 @@
/**
* A vector of CatalogReaders.
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2018-12-31 21:21:59.000051950 +0000
@@ -63,13 +63,13 @@
public static final String xmlCatalogSysId = "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";
@@ -1460,8 +1460,8 @@
/** Constructor. */
public BootstrapResolver() {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2018-12-31 21:21:59.000051950 +0000
@@ -78,7 +78,7 @@
* or "{namespaceuri}elementname". The former is used if the
* namespace URI is null.
@@ -1472,8 +1472,8 @@
/**
* Add a new parser to the reader.
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2018-12-31 21:21:59.000051950 +0000
@@ -89,7 +89,7 @@
* or "{namespaceuri}elementname". The former is used if the
* namespace URI is null.
@@ -1484,8 +1484,8 @@
/** The parser in use for the current catalog. */
private SAXCatalogParser saxParser = null;
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2018-12-31 21:21:59.000051950 +0000
@@ -820,7 +820,7 @@
throws SAXException
{
@@ -1496,8 +1496,8 @@
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2018-12-31 21:21:59.000051950 +0000
@@ -371,8 +371,8 @@
if ( _byName != null )
return;
@@ -1528,8 +1528,8 @@
defineBoolean( "BUTTON", "disabled" );
defineBoolean( "DIR", "compact" );
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2018-12-31 21:21:59.000051950 +0000
@@ -48,7 +48,7 @@
* The keys to the hashtable to find the index are either
* "prefix:localName" or "{uri}localName".
@@ -1540,8 +1540,8 @@
private final StringBuffer m_buff = new StringBuffer();
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2018-05-20 04:38:34.416808053 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2018-12-31 21:17:36.548170429 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2018-12-31 21:21:59.000051950 +0000
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -1563,8 +1563,8 @@
final String javaName = (String) keys.nextElement();
final String[] mimes = parseMimeTypes(props.getProperty(javaName));
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2018-12-31 21:21:59.000051950 +0000
@@ -159,7 +159,7 @@
{
@@ -1575,8 +1575,8 @@
m_attrs.put(name, flags);
}
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2018-12-31 21:21:59.000051950 +0000
@@ -333,10 +333,10 @@
public static final String FUNC_DOCLOCATION_STRING = "document-location";
@@ -1593,8 +1593,8 @@
axisnames.put(FROM_ANCESTORS_STRING, OpCodes.FROM_ANCESTORS);
axisnames.put(FROM_ANCESTORS_OR_SELF_STRING, OpCodes.FROM_ANCESTORS_OR_SELF);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
---- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2018-12-31 21:21:59.000051950 +0000
@@ -140,7 +140,7 @@
private int fAttributeDeclNextAttributeDeclIndex[][] = new int[INITIAL_CHUNK_COUNT][];
@@ -1614,8 +1614,8 @@
/** Default constructor. */
public DTDGrammar(SymbolTable symbolTable) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java
---- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2018-12-31 21:21:59.000051950 +0000
@@ -63,7 +63,7 @@
protected boolean fWarnDuplicateEntityDef;
@@ -1626,8 +1626,8 @@
protected Entity.ScannedEntity fCurrentEntity ;
diff -Nru openjdk-boot.orig/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java
---- openjdk-boot.orig/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2018-05-17 02:55:36.000000000 +0100
-+++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2018-10-22 06:22:48.000000000 +0100
++++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2018-12-31 21:21:59.000051950 +0000
@@ -465,7 +465,7 @@
*/
public Enumeration getPrefixes (String uri)
@@ -1671,8 +1671,8 @@
}
diff -Nru openjdk-boot.orig/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java openjdk-boot/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
---- openjdk-boot.orig/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java 2018-05-17 02:55:37.000000000 +0100
-+++ openjdk-boot/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java 2018-10-22 06:22:49.000000000 +0100
++++ openjdk-boot/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java 2018-12-31 21:21:59.000051950 +0000
@@ -131,7 +131,7 @@
args[i] = in.readObject();
}
@@ -1683,8 +1683,8 @@
argList.add(in.readObject());
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2018-12-31 21:21:59.000051950 +0000
@@ -63,9 +63,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -1700,8 +1700,8 @@
private Reference loader;
private ExceptionListener listener;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2018-12-31 21:21:59.000051950 +0000
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -1721,8 +1721,8 @@
CACHE.put(actual, map);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2018-05-20 04:52:08.139913634 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2018-12-31 21:21:59.000051950 +0000
@@ -45,7 +45,7 @@
private final Kind keyKind; // a reference kind for the cache keys
private final Kind valueKind; // a reference kind for the cache values
@@ -1769,8 +1769,8 @@
};
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2018-12-31 21:21:59.004051887 +0000
@@ -103,9 +103,9 @@
return this.def.compareTo(that.def);
}
@@ -1842,8 +1842,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2018-05-20 04:38:34.956799495 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2018-12-31 21:17:36.616169363 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2018-12-31 21:21:59.004051887 +0000
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -1912,8 +1912,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2018-05-20 04:38:34.316809638 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2018-12-31 21:17:36.348173567 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2018-12-31 21:21:59.004051887 +0000
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -1924,8 +1924,8 @@
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2018-12-31 21:21:59.004051887 +0000
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -1962,8 +1962,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2018-12-31 21:21:59.004051887 +0000
@@ -402,7 +402,7 @@
private static Map codeMap;
@@ -1974,8 +1974,8 @@
Coding x1 = codeMap.get(x0);
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2018-12-31 21:21:59.004051887 +0000
@@ -917,7 +917,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -2004,8 +2004,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2018-05-20 04:38:34.956799495 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2018-12-31 21:17:36.616169363 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2018-12-31 21:21:59.004051887 +0000
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -2043,8 +2043,8 @@
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2018-12-31 21:21:59.004051887 +0000
@@ -45,7 +45,7 @@
private final ArrayList flist;
@@ -2055,8 +2055,8 @@
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2018-12-31 21:21:59.004051887 +0000
@@ -126,11 +126,11 @@
public void setBytes(byte[] newBytes) {
if (bytes == newBytes) return;
@@ -2081,8 +2081,8 @@
static final int LOC_SHIFT = 1;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2018-05-20 04:38:34.316809638 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2018-12-31 21:17:36.348173567 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2018-12-31 21:21:59.004051887 +0000
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map attrDefs;
@@ -2247,8 +2247,8 @@
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2018-05-20 04:38:34.956799495 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2018-12-31 21:17:36.616169363 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2018-12-31 21:21:59.004051887 +0000
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -2362,8 +2362,8 @@
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2018-05-20 04:38:34.956799495 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2018-12-31 21:17:36.620169299 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2018-12-31 21:21:59.004051887 +0000
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurrences
@@ -2419,8 +2419,8 @@
for (Class cls : pkg.classes) {
if (!cls.hasInnerClasses()) continue;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2018-12-31 21:21:59.004051887 +0000
@@ -181,8 +181,8 @@
final Map attrDefs;
final Map attrCommands;
@@ -2451,8 +2451,8 @@
for (JarEntry je : Collections.list(jf.entries())) {
InFile inFile = new InFile(jf, je);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2018-12-31 21:21:59.004051887 +0000
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -2463,8 +2463,8 @@
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2018-05-20 04:38:34.956799495 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2018-12-31 21:17:36.620169299 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2018-12-31 21:21:59.004051887 +0000
@@ -47,8 +47,8 @@
*/
@@ -2486,8 +2486,8 @@
while (res.remove(null));
return res;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2018-12-31 21:21:59.004051887 +0000
@@ -58,12 +58,12 @@
private final Map memberEntries;
@@ -2508,8 +2508,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2018-05-20 04:38:34.956799495 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2018-05-20 04:52:08.143913571 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2018-12-31 21:17:36.620169299 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2018-12-31 21:21:59.008051825 +0000
@@ -232,7 +232,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -2520,8 +2520,8 @@
String name = file.nameString;
JarEntry je = new JarEntry(Utils.getJarEntryName(name));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2018-05-20 04:38:34.956799495 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2018-12-31 21:17:36.620169299 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2018-12-31 21:21:59.008051825 +0000
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -2532,8 +2532,8 @@
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2018-12-31 21:21:59.008051825 +0000
@@ -56,7 +56,7 @@
// principal in the delegated subject
//
@@ -2544,8 +2544,8 @@
final String pname = p.getClass().getName() + "." + p.getName();
permissions.add(new SubjectDelegationPermission(pname));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java 2018-12-31 21:21:59.008051825 +0000
@@ -1093,7 +1093,7 @@
@SuppressWarnings("unchecked")
public Hashtable getEnvironment() throws NamingException {
@@ -2565,8 +2565,8 @@
// copy-on-write
_env = (Hashtable)_env.clone();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java 2018-12-31 21:21:59.008051825 +0000
@@ -132,7 +132,7 @@
throws InvalidNameException {
@@ -2577,8 +2577,8 @@
char[] kind = new char[len];
int idCount, kindCount;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java 2018-12-31 21:21:59.008051825 +0000
@@ -185,7 +185,7 @@
} else {
stringName = UrlUtil.decode(url.substring(addrEnd+1));
@@ -2589,8 +2589,8 @@
// Only one host:port part, not multiple
addresses.addElement(
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2018-12-31 21:21:59.008051825 +0000
@@ -59,7 +59,7 @@
public Context getInitialContext(Hashtable,?> env) throws NamingException {
@@ -2610,8 +2610,8 @@
int colon = platformServer.indexOf(':',
platformServer.indexOf(']') + 1);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java 2018-12-31 21:21:59.008051825 +0000
@@ -110,7 +110,7 @@
// The labels of this domain name, as a list of strings. Index 0
// corresponds to the leftmost (least significant) label: note that
@@ -2622,8 +2622,8 @@
// The number of octets needed to carry this domain name in a DNS
// packet. Equal to the sum of the lengths of each label, plus the
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java 2018-12-31 21:21:59.008051825 +0000
@@ -140,7 +140,7 @@
NameNode child = null;
@@ -2634,8 +2634,8 @@
child = node.children.get(key);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java 2018-12-31 21:21:59.008051825 +0000
@@ -45,10 +45,10 @@
// Four sections: question, answer, authority, additional.
// The question section is treated as being made up of (shortened)
@@ -2652,8 +2652,8 @@
/*
* True if these resource records are from a zone transfer. In
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java 2018-12-31 21:21:59.008051825 +0000
@@ -119,7 +119,7 @@
* NamingEventNotifiers; hashed by search arguments;
*/
@@ -2682,8 +2682,8 @@
unsolicited.addElement((UnsolicitedNotificationListener)l);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2018-12-31 21:21:59.008051825 +0000
@@ -82,7 +82,7 @@
// Default list of binary attributes
@@ -2757,8 +2757,8 @@
unsolicited.setSize(0); // no more listeners after exception
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java 2018-12-31 21:21:59.008051825 +0000
@@ -221,7 +221,7 @@
* Used by Obj and obj/RemoteToAttrs too so must be public
*/
@@ -2769,8 +2769,8 @@
if (types.length > 0) {
BasicAttribute tAttr =
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java 2018-05-20 04:38:34.420807990 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java 2018-12-31 21:17:36.552170366 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java 2018-12-31 21:21:59.008051825 +0000
@@ -313,7 +313,7 @@
this.useDefaultPortNumber = true;
}
@@ -2840,8 +2840,8 @@
if (s.startsWith("ldap:")) {
refs.add(s);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java 2018-12-31 21:21:59.008051825 +0000
@@ -111,7 +111,7 @@
*/
private LdapName(String name, Vector rdns, int beg, int end) {
@@ -2870,8 +2870,8 @@
void add(TypeAndValue tv) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java 2018-12-31 21:21:59.008051825 +0000
@@ -59,7 +59,7 @@
switch (status) {
case LdapClient.LDAP_COMPARE_TRUE:
@@ -2891,8 +2891,8 @@
break;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java 2018-12-31 21:21:59.008051825 +0000
@@ -519,7 +519,7 @@
throws NamingException {
@@ -2912,8 +2912,8 @@
if (debug) {
System.err.println("ReadOIDList: pos="+pos[0]);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java 2018-12-31 21:21:59.008051825 +0000
@@ -83,7 +83,7 @@
context = (LdapCtx)ctx.newInstance(new Control[]{psearch});
eventSrc = ctx;
@@ -2924,8 +2924,8 @@
worker = Obj.helper.createThread(this);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2018-05-20 04:38:34.968799304 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2018-12-31 21:17:36.636169049 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2018-12-31 21:21:59.008051825 +0000
@@ -207,7 +207,7 @@
} else {
StringTokenizer parser =
@@ -2945,8 +2945,8 @@
for (NamingEnumeration> vals = attr.getAll(); vals.hasMore(); ) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2018-12-31 21:21:59.008051825 +0000
@@ -98,11 +98,11 @@
} else {
this.prefSize = prefSize;
@@ -2974,8 +2974,8 @@
for (ConnectionDesc entry : clonedConns) {
d("expire(): ", entry);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2018-12-31 21:21:59.008051825 +0000
@@ -83,7 +83,7 @@
* Used for connections cleanup
*/
@@ -3008,8 +3008,8 @@
for (ConnectionsRef ref : copy) {
conns = ref.getConnections();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java 2018-12-31 21:21:59.008051825 +0000
@@ -186,7 +186,7 @@
*/
private static String[] getSaslMechanismNames(String str) {
@@ -3020,8 +3020,8 @@
mechs.addElement(parser.nextToken());
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java 2018-05-20 04:52:08.147913507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java 2018-12-31 21:21:59.012051762 +0000
@@ -155,7 +155,8 @@
if ((e instanceof CannotProceedException)) {
CannotProceedException cpe = (CannotProceedException)e;
@@ -3033,8 +3033,8 @@
cpe.setAltNameCtx(resolvedContext);
cpe.setAltName(relativeResolvedName);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java 2018-12-31 21:21:59.012051762 +0000
@@ -84,7 +84,7 @@
private void init() {
@@ -3054,8 +3054,8 @@
return (Hashtable)myEnv.clone();
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java 2018-12-31 21:21:59.012051762 +0000
@@ -208,7 +208,7 @@
private boolean polarity;
@@ -3066,8 +3066,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java 2018-12-31 21:21:59.012051762 +0000
@@ -510,7 +510,7 @@
@SuppressWarnings("unchecked") // clone()
public Hashtable getEnvironment() throws NamingException {
@@ -3078,8 +3078,8 @@
return (Hashtable)myEnv.clone();
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2018-12-31 21:21:59.012051762 +0000
@@ -54,7 +54,7 @@
* Contains event dispatcher per thread group.
*/
@@ -3090,8 +3090,8 @@
/**
* Constructs a new AbstractLine.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2018-12-31 21:21:59.012051762 +0000
@@ -102,7 +102,7 @@
&& !SoundbankReader.class.equals(serviceClass)
&& !MidiFileWriter.class.equals(serviceClass)
@@ -3102,8 +3102,8 @@
providers = JSSecurityManager.getProviders(serviceClass);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2018-12-31 21:21:59.012051762 +0000
@@ -59,7 +59,7 @@
* dispatcher instance with a factory in EventDispatcher
*/
@@ -3114,8 +3114,8 @@
/**
* All RealTimeSequencers share this info object.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2018-12-31 21:21:59.012051762 +0000
@@ -87,7 +87,7 @@
}
// Instantiate Class to get factory
@@ -3126,8 +3126,8 @@
return answer;
} catch (ClassNotFoundException e) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2018-05-20 04:38:34.888800572 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2018-12-31 21:17:36.552170366 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2018-12-31 21:21:59.012051762 +0000
@@ -97,7 +97,7 @@
*/
// WeakHashMap
@@ -3222,8 +3222,8 @@
propertiesCache.put(cl, result);
return result;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java 2018-12-31 21:21:59.012051762 +0000
@@ -137,7 +137,7 @@
throws MalformedURLException {
// Parse codebase into separate URLs
@@ -3234,8 +3234,8 @@
vec.addElement(parser.nextToken());
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2018-12-31 21:21:59.012051762 +0000
@@ -231,7 +231,7 @@
* Create an empty ExecOptionPermissionCollection.
*/
@@ -3246,8 +3246,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2018-12-31 21:21:59.012051762 +0000
@@ -235,7 +235,7 @@
* Create an empty ExecPermissionCollection.
*/
@@ -3258,8 +3258,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2018-05-20 04:52:08.151913444 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2018-12-31 21:21:59.012051762 +0000
@@ -1285,7 +1285,7 @@
*/
public Collection> toCollection() throws SQLException {
@@ -3279,8 +3279,8 @@
// create a copy
CachedRowSetImpl crsTemp;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2018-12-31 21:21:59.016051699 +0000
@@ -222,7 +222,7 @@
// either of the setter methods have been set.
if(boolColId){
@@ -3291,8 +3291,8 @@
if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) {
iMatchKey = cRowset.findColumn(strMatchKey);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2018-12-31 21:21:59.016051699 +0000
@@ -99,10 +99,10 @@
throws UnsupportedCallbackException
{
@@ -3307,8 +3307,8 @@
ConfirmationInfo confirmation = new ConfirmationInfo();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2018-12-31 21:21:59.016051699 +0000
@@ -152,7 +152,7 @@
// new configuration
@@ -3337,8 +3337,8 @@
String value;
while (peek(";") == false) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2018-12-31 21:21:59.016051699 +0000
@@ -181,7 +181,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -3349,8 +3349,8 @@
// initial state
private Subject subject;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2018-12-31 21:21:59.016051699 +0000
@@ -654,7 +654,7 @@
throw new FailedLoginException(
"Unable to find X.509 certificate chain in keystore");
@@ -3361,8 +3361,8 @@
certList.add(fromKeyStore[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2018-12-31 21:21:59.016051699 +0000
@@ -76,7 +76,7 @@
private SolarisNumericUserPrincipal UIDPrincipal;
private SolarisNumericGroupPrincipal GIDPrincipal;
@@ -3373,8 +3373,8 @@
/**
* Initialize this LoginModule
.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2018-12-31 21:21:59.016051699 +0000
@@ -70,7 +70,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -3385,8 +3385,8 @@
/**
* Initialize this LoginModule
.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2018-12-31 21:21:59.016051699 +0000
@@ -1179,7 +1179,7 @@
// Done
return certs;
@@ -3397,8 +3397,8 @@
while (i < certs.length) {
userCertList.add(certs[i]);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2018-12-31 21:21:59.016051699 +0000
@@ -59,7 +59,7 @@
// Maps ThreadReference to ThreadTrace instances
@@ -3409,8 +3409,8 @@
EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) {
super("event-handler");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/Cursor.java openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java
---- openjdk-boot.orig/jdk/src/share/classes/java/awt/Cursor.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/Cursor.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java 2018-12-31 21:21:59.016051699 +0000
@@ -163,7 +163,7 @@
* hashtable, filesystem dir prefix, filename, and properties for custom cursors support
*/
@@ -3421,8 +3421,8 @@
private static String initCursorDir() {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
---- openjdk-boot.orig/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2018-12-31 21:21:59.016051699 +0000
@@ -341,7 +341,7 @@
* @since 1.5
*/
@@ -3433,8 +3433,8 @@
if (contents != null) {
DataFlavor[] flavors = contents.getTransferDataFlavors();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/EventQueue.java openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java
---- openjdk-boot.orig/jdk/src/share/classes/java/awt/EventQueue.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/EventQueue.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java 2018-12-31 21:21:59.016051699 +0000
@@ -1183,7 +1183,7 @@
return;
}
@@ -3445,8 +3445,8 @@
// This series of 'instanceof' checks should be replaced with a
// polymorphic type (for example, an interface which declares a
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/MenuBar.java openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java
---- openjdk-boot.orig/jdk/src/share/classes/java/awt/MenuBar.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/MenuBar.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java 2018-12-31 21:21:59.016051699 +0000
@@ -94,7 +94,7 @@
* @serial
* @see #countMenus()
@@ -3466,8 +3466,8 @@
for (int i = 0 ; i < nmenus ; i++) {
Enumeration e = getMenu(i).shortcuts();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/Menu.java openjdk-boot/jdk/src/share/classes/java/awt/Menu.java
---- openjdk-boot.orig/jdk/src/share/classes/java/awt/Menu.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/awt/Menu.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/Menu.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/Menu.java 2018-12-31 21:21:59.016051699 +0000
@@ -78,7 +78,7 @@
* @serial
* @see #countItems()
@@ -3505,8 +3505,8 @@
for (int i = 0 ; i < nitems ; i++) {
MenuItem mi = getItem(i);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/RenderingHints.java openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java
---- openjdk-boot.orig/jdk/src/share/classes/java/awt/RenderingHints.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/RenderingHints.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java 2018-12-31 21:21:59.016051699 +0000
@@ -92,7 +92,7 @@
* {@code equals()} method.
*/
@@ -3526,8 +3526,8 @@
/**
* Antialiasing hint key.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2018-12-31 21:21:59.016051699 +0000
@@ -106,7 +106,7 @@
public final static int IGNORE_ALL_BEANINFO = 3;
@@ -3556,8 +3556,8 @@
}
return targetBeanInfo;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2018-12-31 21:21:59.016051699 +0000
@@ -44,7 +44,7 @@
}
else {
@@ -3577,8 +3577,8 @@
}
return isPackageAccessible(method.getDeclaringClass()) ? method : null;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2018-12-31 21:21:59.016051699 +0000
@@ -96,7 +96,7 @@
BeanInfo putBeanInfo(Class> type, BeanInfo info) {
@@ -3589,8 +3589,8 @@
return this.beanInfoCache.put(type, info);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2018-12-31 21:21:59.016051699 +0000
@@ -34,7 +34,7 @@
*/
@@ -3610,8 +3610,8 @@
// reverse the list to maintain previous jdk deletion order.
// Last in first deleted.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2018-12-31 21:21:59.016051699 +0000
@@ -61,7 +61,7 @@
private volatile boolean closed = false;
@@ -3622,8 +3622,8 @@
private static boolean isRunningFinalize() {
Boolean val;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/File.java openjdk-boot/jdk/src/share/classes/java/io/File.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2018-05-20 04:52:08.155913381 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2018-12-31 21:21:59.020051637 +0000
@@ -1150,7 +1150,7 @@
if ((names == null) || (filter == null)) {
return names;
@@ -3652,8 +3652,8 @@
File f = new File(s, this);
if ((filter == null) || filter.accept(f))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2018-05-20 04:52:08.159913318 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2018-12-31 21:21:59.020051637 +0000
@@ -76,7 +76,7 @@
private final Object closeLock = new Object();
private volatile boolean closed = false;
@@ -3664,8 +3664,8 @@
private static boolean isRunningFinalize() {
Boolean val;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2018-05-20 04:54:11.085965683 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2018-12-31 21:21:59.020051637 +0000
@@ -725,7 +725,7 @@
*/
@@ -3694,8 +3694,8 @@
perms.add(perm);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2018-05-20 04:52:08.159913318 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2018-12-31 21:21:59.020051637 +0000
@@ -220,7 +220,7 @@
/** table mapping primitive type names to corresponding class objects */
@@ -3720,8 +3720,8 @@
static {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2018-05-20 04:52:08.159913318 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2018-12-31 21:21:59.020051637 +0000
@@ -166,11 +166,11 @@
private static class Caches {
/** cache of subclass security audit results */
@@ -3746,9 +3746,9 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2018-05-20 04:38:34.888800572 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2018-05-20 04:52:08.159913318 +0100
-@@ -94,18 +94,18 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2018-12-31 21:17:36.552170366 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2018-12-31 21:21:59.020051637 +0000
+@@ -106,18 +106,18 @@
private static class Caches {
/** cache mapping local classes -> descriptors */
static final ConcurrentMap> localDescs =
@@ -3771,7 +3771,7 @@
}
/** class associated with this descriptor (if any) */
-@@ -342,7 +342,7 @@
+@@ -354,7 +354,7 @@
EntryFuture future = null;
if (entry == null) {
EntryFuture newEntry = new EntryFuture();
@@ -3780,7 +3780,7 @@
do {
if (ref != null) {
Caches.localDescs.remove(key, ref);
-@@ -596,7 +596,7 @@
+@@ -608,7 +608,7 @@
while (cls != fnscl) {
ProtectionDomain pd = cls.getProtectionDomain();
if (pd != null) {
@@ -3789,7 +3789,7 @@
pds.add(pd);
}
cls = cls.getSuperclass();
-@@ -604,7 +604,7 @@
+@@ -616,7 +616,7 @@
// that's not supposed to happen
// make a ProtectionDomain with no permission.
// should we throw instead?
@@ -3798,7 +3798,7 @@
else pds.clear();
pds.add(noPermissionsDomain());
break;
-@@ -1305,7 +1305,7 @@
+@@ -1317,7 +1317,7 @@
private ClassDataSlot[] getClassDataLayout0()
throws InvalidClassException
{
@@ -3807,7 +3807,7 @@
Class> start = cl, end = cl;
// locate closest non-serializable superclass
-@@ -1313,7 +1313,7 @@
+@@ -1325,7 +1325,7 @@
end = end.getSuperclass();
}
@@ -3816,7 +3816,7 @@
for (ObjectStreamClass d = this; d != null; d = d.superDesc) {
if (oscNames.contains(d.name)) {
-@@ -1748,7 +1748,7 @@
+@@ -1802,7 +1802,7 @@
ObjectStreamField[] boundFields =
new ObjectStreamField[serialPersistentFields.length];
@@ -3825,7 +3825,7 @@
for (int i = 0; i < serialPersistentFields.length; i++) {
ObjectStreamField spf = serialPersistentFields[i];
-@@ -1786,7 +1786,7 @@
+@@ -1840,7 +1840,7 @@
*/
private static ObjectStreamField[] getDefaultSerialFields(Class> cl) {
Field[] clFields = cl.getDeclaredFields();
@@ -3834,7 +3834,7 @@
int mask = Modifier.STATIC | Modifier.TRANSIENT;
for (int i = 0; i < clFields.length; i++) {
-@@ -2037,8 +2037,8 @@
+@@ -2091,8 +2091,8 @@
writeKeys = new long[nfields];
offsets = new int[nfields];
typeCodes = new char[nfields];
@@ -3845,7 +3845,7 @@
for (int i = 0; i < nfields; i++) {
-@@ -2274,7 +2274,7 @@
+@@ -2328,7 +2328,7 @@
EntryFuture future = null;
if (entry == null) {
EntryFuture newEntry = new EntryFuture();
@@ -3855,8 +3855,8 @@
if (ref != null) {
Caches.reflectors.remove(key, ref);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2018-05-20 04:52:08.159913318 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2018-12-31 21:21:59.020051637 +0000
@@ -47,7 +47,7 @@
}
}
@@ -3867,8 +3867,8 @@
// application shutdown hooks cannot be added if
// shutdown is in progress.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java openjdk-boot/jdk/src/share/classes/java/lang/Character.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2018-05-20 04:52:08.159913318 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2018-12-31 21:21:59.020051637 +0000
@@ -646,7 +646,8 @@
*/
public static final class UnicodeBlock extends Subset {
@@ -3889,8 +3889,8 @@
aliases.put("ARMI", IMPERIAL_ARAMAIC);
aliases.put("ARMN", ARMENIAN);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2018-05-20 04:52:08.159913318 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2018-12-31 21:21:59.020051637 +0000
@@ -81,7 +81,7 @@
} while (cpOff < cpEnd);
strPool = new byte[total - cpEnd];
@@ -3901,8 +3901,8 @@
throw new InternalError(x.getMessage());
} finally {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java openjdk-boot/jdk/src/share/classes/java/lang/Class.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2018-05-20 04:52:08.159913318 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2018-12-31 21:21:59.024051573 +0000
@@ -1359,7 +1359,7 @@
return java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction[]>() {
@@ -3955,8 +3955,8 @@
for (Map.Entry, Annotation> e : superClass.annotations.entrySet()) {
Class extends Annotation> annotationClass = e.getKey();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2018-12-31 21:21:59.024051573 +0000
@@ -253,7 +253,7 @@
// The classes loaded by this class loader. The only purpose of this table
@@ -4063,8 +4063,8 @@
for(int i = 0; i < directives.classes.length; i++)
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2018-12-31 21:21:59.024051573 +0000
@@ -297,12 +297,12 @@
* Some machines may also require a barrier instruction to execute
* before this.version.
@@ -4106,8 +4106,8 @@
// As soon as the Entry is put into the cache, the value will be
// reachable via a data race (as defined by the Java Memory Model).
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2018-05-20 04:38:34.988798987 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2018-12-31 21:17:36.656168735 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2018-12-31 21:21:59.024051573 +0000
@@ -393,7 +393,7 @@
}
private boolean isPlaceholder() { return clazz == null; }
@@ -4118,8 +4118,8 @@
SpeciesData extendWithType(char type) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2018-12-31 21:21:59.024051573 +0000
@@ -290,7 +290,7 @@
if (UNSAFE.shouldBeInitialized(type))
// If the previous call didn't block, this can happen.
@@ -4130,8 +4130,8 @@
}
static final EnsureInitialized INSTANCE = new EnsureInitialized();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2018-05-20 04:38:34.988798987 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2018-12-31 21:17:36.660168671 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2018-12-31 21:21:59.024051573 +0000
@@ -129,7 +129,7 @@
static {
@@ -4151,8 +4151,8 @@
int cph = 0; // for counting constant placeholders
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2018-05-20 04:38:34.988798987 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2018-12-31 21:17:36.660168671 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2018-12-31 21:21:59.024051573 +0000
@@ -468,12 +468,12 @@
int capacity = 512; // expect many distinct signatures over time
float loadFactor = 0.75f; // normal default
@@ -4169,8 +4169,8 @@
if (!m.isStatic() || !m.isPackage()) continue;
MethodType mt = m.getMethodType();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2018-05-20 04:38:34.888800572 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2018-12-31 21:17:36.556170303 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2018-12-31 21:21:59.024051573 +0000
@@ -808,14 +808,14 @@
// JVM returned to us with an intentional overflow!
totalCount += buf.length;
@@ -4189,8 +4189,8 @@
for (MemberName[] buf0 : bufs) {
Collections.addAll(result, buf0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2018-05-20 04:38:34.988798987 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2018-12-31 21:17:36.660168671 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2018-12-31 21:21:59.024051573 +0000
@@ -73,8 +73,8 @@
static final class ArrayAccessor {
@@ -4212,8 +4212,8 @@
for (;;) {
int nargs = invokes.size();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2018-12-31 21:21:59.024051573 +0000
@@ -834,7 +834,7 @@
}
}
@@ -4224,8 +4224,8 @@
ptypes.set(i, arrayElement);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2018-12-31 21:21:59.024051573 +0000
@@ -1953,7 +1953,7 @@
int inargs = outargs + dropped;
if (pos < 0 || pos >= inargs)
@@ -4236,8 +4236,8 @@
if (ptypes.size() != inargs) throw newIllegalArgumentException("valueTypes");
MethodType newType = MethodType.methodType(oldType.returnType(), ptypes);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2018-12-31 21:21:59.024051573 +0000
@@ -1044,7 +1044,7 @@
private final float loadFactor;
@@ -4248,8 +4248,8 @@
private Entry[] newTable(int n) {
return new Entry[n];
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2018-05-20 04:38:34.888800572 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2018-12-31 21:17:36.556170303 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2018-12-31 21:21:59.024051573 +0000
@@ -789,7 +789,7 @@
getPlatformManagementInterfaces()
{
@@ -4260,8 +4260,8 @@
result.add(component.getMXBeanInterface());
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2018-12-31 21:21:59.024051573 +0000
@@ -287,7 +287,7 @@
List getGcMXBeanList(Class gcMXBeanIntf) {
List list =
@@ -4299,8 +4299,8 @@
// Use String as the key rather than Class> to avoid
// causing unnecessary class loading of management interface
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2018-05-20 04:38:34.960799432 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2018-12-31 21:17:36.620169299 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2018-12-31 21:21:59.024051573 +0000
@@ -599,13 +599,16 @@
}
@@ -4322,8 +4322,8 @@
private static native String getSystemPackage0(String name);
private static native String[] getSystemPackages0();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2018-05-20 04:38:34.892800509 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2018-12-31 21:17:36.556170303 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2018-12-31 21:21:59.024051573 +0000
@@ -214,7 +214,7 @@
* @param command a string array containing the program and its arguments
*/
@@ -4343,8 +4343,8 @@
this.command.add(arg);
return this;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2018-12-31 21:21:59.028051511 +0000
@@ -137,7 +137,7 @@
// which implicitly requires that new java.lang.reflect
// objects be fabricated for each reflective call on Class
@@ -4355,8 +4355,8 @@
exceptionTypes, modifiers, slot,
signature,
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2018-05-20 04:38:34.892800509 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2018-05-20 04:52:08.163913254 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2018-12-31 21:17:36.556170303 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2018-12-31 21:21:59.028051511 +0000
@@ -234,7 +234,7 @@
* a cache of proxy classes
*/
@@ -4376,8 +4376,8 @@
/*
* Verify that the class loader resolves the name of this
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2018-12-31 21:21:59.028051511 +0000
@@ -84,7 +84,7 @@
byte[] annotations,
byte[] parameterAnnotations)
@@ -4388,8 +4388,8 @@
checkedExceptions,
modifiers,
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2018-12-31 21:21:59.028051511 +0000
@@ -71,12 +71,12 @@
}
@@ -4443,8 +4443,8 @@
private final int hash;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2018-12-31 21:21:59.028051511 +0000
@@ -53,9 +53,9 @@
/** The cached coders for each thread */
@@ -4458,8 +4458,8 @@
private static boolean warnUnsupportedCharset = true;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java openjdk-boot/jdk/src/share/classes/java/lang/String.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2018-12-31 21:21:59.028051511 +0000
@@ -2282,7 +2282,7 @@
int off = 0;
int next = 0;
@@ -4470,8 +4470,8 @@
if (!limited || list.size() < limit - 1) {
list.add(substring(off, next));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java openjdk-boot/jdk/src/share/classes/java/lang/Thread.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2018-12-31 21:21:59.028051511 +0000
@@ -1641,7 +1641,8 @@
// Get a snapshot of the list of all threads
Thread[] threads = getThreads();
@@ -4497,8 +4497,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2018-12-31 21:21:59.028051511 +0000
@@ -918,7 +918,7 @@
// Use the sentinel for a zero-length list
suppressed = SUPPRESSED_SENTINEL;
@@ -4518,9 +4518,9 @@
suppressedExceptions.add(exception);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java
---- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2018-05-20 04:52:08.167913190 +0100
-@@ -733,7 +733,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2018-12-31 21:21:59.028051511 +0000
+@@ -734,7 +734,7 @@
static InetAddressImpl impl;
@@ -4529,7 +4529,7 @@
/**
* Represents a cache entry
-@@ -792,7 +792,7 @@
+@@ -793,7 +793,7 @@
// As we iterate in insertion order we can
// terminate when a non-expired entry is found.
@@ -4539,8 +4539,8 @@
for (String key : cache.keySet()) {
CacheEntry entry = cache.get(key);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/SocketPermission.java openjdk-boot/jdk/src/share/classes/java/net/SocketPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/net/SocketPermission.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/net/SocketPermission.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/net/SocketPermission.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/net/SocketPermission.java 2018-12-31 21:21:59.028051511 +0000
@@ -1453,7 +1453,7 @@
// Don't call out.defaultWriteObject()
@@ -4551,9 +4551,9 @@
synchronized (this) {
permissions.addAll(perms);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java
---- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2018-05-20 04:52:08.167913190 +0100
-@@ -198,7 +198,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2018-12-31 21:21:59.028051511 +0000
+@@ -199,7 +199,7 @@
*/
private WeakHashMap
@@ -4563,8 +4563,8 @@
/**
* Returns an input stream for reading the specified resource.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/URLConnection.java openjdk-boot/jdk/src/share/classes/java/net/URLConnection.java
---- openjdk-boot.orig/jdk/src/share/classes/java/net/URLConnection.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/net/URLConnection.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLConnection.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/net/URLConnection.java 2018-12-31 21:21:59.028051511 +0000
@@ -1237,7 +1237,7 @@
factory = fac;
}
@@ -4575,8 +4575,8 @@
/**
* Gets the Content Handler appropriate for this connection.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/URL.java openjdk-boot/jdk/src/share/classes/java/net/URL.java
---- openjdk-boot.orig/jdk/src/share/classes/java/net/URL.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/net/URL.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/net/URL.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/net/URL.java 2018-12-31 21:21:59.028051511 +0000
@@ -1126,7 +1126,7 @@
/**
* A table of protocol handlers.
@@ -4587,8 +4587,8 @@
// special case the gopher protocol, disabled by default
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java
---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2018-05-20 04:38:34.972799241 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2018-12-31 21:17:36.644168923 +0000
++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2018-12-31 21:21:59.028051511 +0000
@@ -1504,7 +1504,7 @@
return AccessController
.doPrivileged(new PrivilegedAction>() {
@@ -4608,8 +4608,8 @@
String line = reader.readLine();
if (line == null)
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/FileTreeWalker.java openjdk-boot/jdk/src/share/classes/java/nio/file/FileTreeWalker.java
---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/FileTreeWalker.java 2018-05-20 04:38:34.912800192 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/nio/file/FileTreeWalker.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/FileTreeWalker.java 2018-12-31 21:17:36.572170053 +0000
++++ openjdk-boot/jdk/src/share/classes/java/nio/file/FileTreeWalker.java 2018-12-31 21:21:59.028051511 +0000
@@ -58,7 +58,7 @@
private final boolean followLinks;
private final LinkOption[] linkOptions;
@@ -4620,8 +4620,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2018-12-31 21:21:59.032051449 +0000
@@ -134,7 +134,7 @@
this.context = null;
}
@@ -4632,8 +4632,8 @@
if ((context[i] != null) && (!v.contains(context[i])))
v.add(context[i]);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2018-12-31 21:21:59.032051449 +0000
@@ -513,7 +513,7 @@
// Copy perms into a Hashtable
@@ -4644,8 +4644,8 @@
synchronized (this) {
permissions.putAll(perms);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java openjdk-boot/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2018-12-31 21:21:59.032051449 +0000
@@ -232,7 +232,7 @@
} else if (size < 0) {
throw new IOException("size cannot be negative");
@@ -4656,8 +4656,8 @@
// Read in the extensions and put the mappings in the extensions map
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2018-05-20 04:52:08.167913190 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2018-12-31 21:21:59.032051449 +0000
@@ -189,7 +189,7 @@
} else if (signers != null) {
// Convert the code signers to certs
@@ -4690,8 +4690,8 @@
int j = i;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/KeyStore.java openjdk-boot/jdk/src/share/classes/java/security/KeyStore.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/KeyStore.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/KeyStore.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/KeyStore.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/KeyStore.java 2018-12-31 21:21:59.032051449 +0000
@@ -492,7 +492,7 @@
}
@@ -4720,8 +4720,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java openjdk-boot/jdk/src/share/classes/java/security/Permissions.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2018-12-31 21:21:59.032051449 +0000
@@ -361,7 +361,7 @@
// Copy perms into a Hashtable
@@ -4741,8 +4741,8 @@
perms.putAll(permsMap);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java openjdk-boot/jdk/src/share/classes/java/security/Policy.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2018-12-31 21:21:59.032051449 +0000
@@ -109,7 +109,7 @@
// PolicyInfo is stored in an AtomicReference
@@ -4762,8 +4762,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2018-12-31 21:21:59.032051449 +0000
@@ -400,8 +400,8 @@
int swag = 32;
int vcap = 8;
@@ -4776,8 +4776,8 @@
//
// Build a vector of domain permissions for subsequent merge
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java openjdk-boot/jdk/src/share/classes/java/security/Provider.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2018-12-31 21:21:59.032051449 +0000
@@ -434,7 +434,7 @@
private void readObject(ObjectInputStream in)
@@ -4806,8 +4806,8 @@
Class> clazz = getKeyClass(className);
if (clazz != null) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2018-12-31 21:21:59.032051449 +0000
@@ -50,7 +50,7 @@
// HashMap that maps CodeSource to ProtectionDomain
// @GuardedBy("pdcache")
@@ -4818,8 +4818,8 @@
private static final Debug debug = Debug.getInstance("scl");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java openjdk-boot/jdk/src/share/classes/java/security/Security.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2018-12-31 21:21:59.032051449 +0000
@@ -544,7 +544,7 @@
value = filter.substring(index + 1);
}
@@ -4866,8 +4866,8 @@
for (int i = 0; i < providers.length; i++) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2018-12-31 21:21:59.032051449 +0000
@@ -119,7 +119,7 @@
public Enumeration elements() {
@@ -4905,8 +4905,8 @@
// Add to Hashtable being serialized
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2018-12-31 21:21:59.032051449 +0000
@@ -200,7 +200,7 @@
if (this.certs == null) {
// extract the signer certs
@@ -4928,8 +4928,8 @@
throw new IOException("size cannot be negative");
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2018-12-31 21:21:59.032051449 +0000
@@ -482,8 +482,8 @@
*/
public List subList(int fromIndex, int toIndex) {
@@ -4959,8 +4959,8 @@
}
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java openjdk-boot/jdk/src/share/classes/java/util/Arrays.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2018-12-31 21:21:59.032051449 +0000
@@ -2825,7 +2825,7 @@
*/
@SafeVarargs
@@ -4971,8 +4971,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java openjdk-boot/jdk/src/share/classes/java/util/Collections.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2018-12-31 21:21:59.036051385 +0000
@@ -1035,7 +1035,7 @@
* @return an unmodifiable view of the specified collection.
*/
@@ -5598,8 +5598,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java openjdk-boot/jdk/src/share/classes/java/util/Currency.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2018-05-20 04:38:34.960799432 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2018-05-20 04:52:08.171913127 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2018-12-31 21:17:36.620169299 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2018-12-31 21:21:59.036051385 +0000
@@ -101,7 +101,7 @@
// class data: instance map
@@ -5610,8 +5610,8 @@
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2018-12-31 21:21:59.036051385 +0000
@@ -508,7 +508,7 @@
int j = 0;
for (int i = 0; i < vals.length; i++)
@@ -5622,8 +5622,8 @@
return a;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2018-12-31 21:21:59.036051385 +0000
@@ -110,9 +110,9 @@
throw new ClassCastException(elementType + " not an enum");
@@ -5646,8 +5646,8 @@
// readObject method for the serialization proxy pattern
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java openjdk-boot/jdk/src/share/classes/java/util/Formatter.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2018-05-20 04:38:34.892800509 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2018-12-31 21:17:36.556170303 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2018-12-31 21:21:59.036051385 +0000
@@ -2531,7 +2531,7 @@
* Finds format specifiers in the format string.
*/
@@ -5658,8 +5658,8 @@
for (int i = 0, len = s.length(); i < len; ) {
if (m.find(i)) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java openjdk-boot/jdk/src/share/classes/java/util/HashMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2018-12-31 21:21:59.036051385 +0000
@@ -895,7 +895,7 @@
*/
void createEntry(int hash, K key, V value, int bucketIndex) {
@@ -5670,8 +5670,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java openjdk-boot/jdk/src/share/classes/java/util/HashSet.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2018-12-31 21:21:59.036051385 +0000
@@ -104,7 +104,7 @@
* default initial capacity (16) and load factor (0.75).
*/
@@ -5718,8 +5718,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2018-12-31 21:21:59.036051385 +0000
@@ -539,7 +539,7 @@
// Creates the new entry.
@@ -5775,8 +5775,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2018-12-31 21:21:59.036051385 +0000
@@ -1142,7 +1142,7 @@
Object[] result = new Object[size];
Iterator> it = iterator();
@@ -5796,8 +5796,8 @@
a[size] = null;
return a;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/Attributes.java openjdk-boot/jdk/src/share/classes/java/util/jar/Attributes.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/Attributes.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/jar/Attributes.java 2018-05-20 04:52:08.175913064 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/Attributes.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/jar/Attributes.java 2018-12-31 21:21:59.036051385 +0000
@@ -71,7 +71,7 @@
* @param size the initial number of attributes
*/
@@ -5816,10 +5816,22 @@
}
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2018-12-31 22:45:54.417075152 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2018-12-31 22:55:50.535760528 +0000
+@@ -185,7 +185,7 @@
+ } else {
+ man = new Manifest(super.getInputStream(manEntry));
+ }
+- manRef = new SoftReference<>(man);
++ manRef = new SoftReference(man);
+ }
+ }
+ return man;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarVerifier.java openjdk-boot/jdk/src/share/classes/java/util/jar/JarVerifier.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarVerifier.java 2018-05-17 02:55:38.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarVerifier.java 2018-05-20 04:52:08.175913064 +0100
-@@ -95,10 +95,10 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarVerifier.java 2018-10-22 06:32:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarVerifier.java 2018-12-31 21:24:03.578097032 +0000
+@@ -95,12 +95,12 @@
public JarVerifier(byte rawBytes[]) {
manifestRawBytes = rawBytes;
@@ -5832,8 +5844,11 @@
+ sigFileData = new Hashtable(11);
+ pendingBlocks = new ArrayList();
baos = new ByteArrayOutputStream();
- manifestDigests = new ArrayList();
- }
+- manifestDigests = new ArrayList<>();
++ manifestDigests = new ArrayList