Mercurial > hg > release > icedtea7-2.6
changeset 2999:fccb67cea959
Bump to icedtea-2.6.19
Upstream changes:
- Bump to icedtea-2.6.19
- PR3729: CVE-2018-3639 fix revision to prefer PR_SPEC_DISABLE_NOEXEC to PR_SPEC_DISABLE
- S7152169: TEST_BUG: sun/security/tools/jarsigner/ec.sh occasionally fail due to keytool error on sparc
- S7194075: Various classes of sunec.jar are duplicated in rt.jar
- S7198901: correct the field size check when decoding a point on ECC curve
- S8006799: Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() (jdk part of 6896617)
- S8031145: Re-examine closed i18n tests to see it they can be moved to the jdk repository.
- S8035974: Refactor DigestBase.engineUpdate() method for better code generation by JIT compiler
- S8135248: Add utility methods to check indexes and ranges
- S8142493: Utility methods to check indexes and ranges doesn't specify behavior when function produces null
- S8146458: Improve exception reporting for Objects.checkIndex/checkFromToIndex/checkFromIndexSize
- S8149365, PR3741: aarch64: memory copy does not prefetch on backwards copy
- S8151340, PR3741: aarch64: prefetch the destination word for write prior to ldxr/stxr loops.
- S8153713, PR3741: aarch64: improve short array clearing using store pair
- S8153797, PR3741: aarch64: Add Arrays.fill stub code
- S8155617, PR3741: aarch64: ClearArray does not use DC ZVA
- S8155794: Move Objects.checkIndex BiFunction accepting methods to an internal package
- S8157841, PR3741: aarch64: prefetch ignores cache line size
- S8159035: CTSMode.java test crashed due to unhandled case of cipher length value as 0
- S8179098: Crypto AES/ECB encryption/decryption performance regression (introduced in jdk9b73)
- S8181594: Efficient and constant-time modular arithmetic
- S8182999: SunEC throws ProviderException on invalid curves
- S8186325, PR3741: AArch64: jtreg test hotspot/test/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java SEGV
- S8187946: Support ISO 4217 Amendments 163 and 164
- S8191073: JpegImageReader throws IndexOutOfBoundsException when trying to read image data from tables-only image
- S8193552: ISO 4217 amendment 165
- S8195478: sun/text/resources/LocaleDataTest.java fails with java.lang.Exception
- S8201317: X25519/X448 code improvements
- S8202026: ISO 4217 amendment 166
- S8203228: Branch-free output conversion for X25519 and X448
- S8204269: ISO 4217 amendment 167
- S8208648: ECC Field Arithmetic Enhancements
- S8208698: Improved ECC Implementation
- S8208746: ISO 4217 Amendment #168 update
- S8209775: ISO 4217 Amendment #169 update
- S8210153: localized currency symbol of VES
- S8211435: Exception in thread "AWT-EventQueue-1" java.lang.IllegalArgumentException: null source
- S8212328: Exceptional throw cases
- S8213431: Improve file protocol handling
- S8213432: Better copies of CopiesList
- S8215982: (tz) Upgrade time-zone data to tzdata2018i
- S8216381: More limited privilege usage
- S8217563: Improve realm maintenance
- S8218781: Localized names for Japanese era Reiwa in COMPAT provider
- S8218873: Improve JSSE endpoint checking
- S8218876: Improve PNG support options
- S8219018: Adjust positions of glyphs
- S8219020: Table alternate substitutions
- S8219775: Certificate validation improvements
- S8220192: Better outlook for SecureRandom
- S8220517: Enhanced GIF support
- S8221518: Normalize normalization
- S8223511: Extended AES support
- S8224560: (tz) Upgrade time-zone data to tzdata2019a
- S8224671, PR3741: AArch64: mauve System.arraycopy test failure
- S8224828, PR3741: aarch64: rflags is not correct after safepoint poll
- S8224880, PR3741: AArch64: java/javac error with AllocatePrefetchDistance
- S8225580: tzdata2018i integration causes test failures on jdk-13
ChangeLog:
2019-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
Bump to 2.6.19.
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-2.6.19.
(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.
* acinclude.m4:
(JDK_UPDATE_VERSION): Bump to 231.
(BUILD_VERSION): Set to b01.
* configure.ac: Bump to 2.6.19.
* hotspot.map.in: Update to icedtea-2.6.19.
* patches/boot/ecj-diamond.patch:
Regenerated. Added new cases in
sun.security.util.Optional and
sun.security.util.Preconditions.
* patches/boot/ecj-multicatch.patch:
Add new case in sun.security.util.ECUtil.
* patches/boot/ecj-stringswitch.patch:
Add new cases in sun.security.util.Preconditions.
* patches/pr2124.patch:
Regenerated following 7194075 change to move
curves to sun.security.ec.CurveDB.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 17 Jul 2019 16:53:58 +0100 |
| parents | b78eb9ee275a |
| children | 3b183ba4a3a3 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac hotspot.map.in patches/boot/ecj-diamond.patch patches/boot/ecj-multicatch.patch patches/boot/ecj-stringswitch.patch patches/pr2124.patch |
| diffstat | 10 files changed, 1322 insertions(+), 1115 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 10 18:09:36 2019 +0100 +++ b/ChangeLog Wed Jul 17 16:53:58 2019 +0100 @@ -1,3 +1,37 @@ +2019-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + Bump to 2.6.19. + * Makefile.am: + (CORBA_CHANGESET): Update to icedtea-2.6.19. + (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. + * acinclude.m4: + (JDK_UPDATE_VERSION): Bump to 231. + (BUILD_VERSION): Set to b01. + * configure.ac: Bump to 2.6.19. + * hotspot.map.in: Update to icedtea-2.6.19. + * patches/boot/ecj-diamond.patch: + Regenerated. Added new cases in + sun.security.util.Optional and + sun.security.util.Preconditions. + * patches/boot/ecj-multicatch.patch: + Add new case in sun.security.util.ECUtil. + * patches/boot/ecj-stringswitch.patch: + Add new cases in sun.security.util.Preconditions. + * patches/pr2124.patch: + Regenerated following 7194075 change to move + curves to sun.security.ec.CurveDB. + 2019-05-10 Andrew John Hughes <gnu_andrew@member.fsf.org> Start 2.6.19 release cycle. @@ -45,7 +79,7 @@ Bump to 2.6.18. * Makefile.am: - (CORBA_CHANGESET): Update to icedtea-2.6.17. + (CORBA_CHANGESET): Update to icedtea-2.6.18. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise.
--- a/Makefile.am Fri May 10 18:09:36 2019 +0100 +++ b/Makefile.am Wed Jul 17 16:53:58 2019 +0100 @@ -1,18 +1,18 @@ # Dependencies -CORBA_CHANGESET = ffed1dd63843 -JAXP_CHANGESET = bbd9f724d9af -JAXWS_CHANGESET = 7d942bc39965 -JDK_CHANGESET = f294f336b24d -LANGTOOLS_CHANGESET = 9f0890e75bcb -OPENJDK_CHANGESET = ed550afe3dd7 - -CORBA_SHA256SUM = c115dfa1027c58b1b6444908e26b613c428661fb210e891c30e6a65e77208776 -JAXP_SHA256SUM = 632aa746ebfd8238c64226bf949d20cc2f1d1423eaabfd19897199b13b434e3c -JAXWS_SHA256SUM = 94fbcc00f3d89b9f3b940af5e7b469d1b945ca99e84b51a7abdadcde33a7be14 -JDK_SHA256SUM = 57b5741ab0807fbc71f15efce11546d943baffeb5f5cf55ec16fed69634abc36 -LANGTOOLS_SHA256SUM = 915f492188b7b214e280532df061adc6c999f0d190ea5f1325bc70b77a2af4f0 -OPENJDK_SHA256SUM = da5fc1846ec80409ad5af870dbeb03d077b4add3ba54c0dde00414bea0376392 +CORBA_CHANGESET = bbd35dc7f27f +JAXP_CHANGESET = 54a9c1431701 +JAXWS_CHANGESET = 6023a2de51e4 +JDK_CHANGESET = 12f4d4744bad +LANGTOOLS_CHANGESET = 219e16f3659b +OPENJDK_CHANGESET = f0a5b39f2e66 + +CORBA_SHA256SUM = aae916ff4c1f3cbdb14f57716d03adf1f2d9cb221bf0fa0580f607d7a360245b +JAXP_SHA256SUM = 4545cf0b2bfeca6cd019f1c8bab3ed7317963776b859f80ffc4d8d79d3c82e8f +JAXWS_SHA256SUM = 9b2b76598996962c5128e586edded4022e162421d9898a57c3d6dce2fbe7ee6b +JDK_SHA256SUM = 1653315e15f30f4f250d6ec9085043b534a28c293ba445467e274c56fef84b88 +LANGTOOLS_SHA256SUM = d9d02a7f135350d66d2dde28dad7f2257843d11cc663b641740b1cf21ec3d710 +OPENJDK_SHA256SUM = 2531838d9cf08755d88c91498da6fef427000d0fd527c7ddeaa60c993aa679ea DROP_URL = https://icedtea.classpath.org/download/drops
--- a/NEWS Fri May 10 18:09:36 2019 +0100 +++ b/NEWS Wed Jul 17 16:53:58 2019 +0100 @@ -14,13 +14,75 @@ New in release 2.6.19 (2019-07-XX): +* Security fixes + - S8191073: JpegImageReader throws IndexOutOfBoundsException when trying to read image data from tables-only image + - S8208698, CVE-2019-2745: Improved ECC Implementation + - S8212328, CVE-2019-2745: Exceptional throw cases + - S8213431, CVE-2019-2766: Improve file protocol handling + - S8213432, CVE-2019-2769: Better copies of CopiesList + - S8216381, CVE-2019-2786: More limited privilege usage + - S8217563: Improve realm maintenance + - S8218873: Improve JSSE endpoint checking + - S8218876, CVE-2019-2745: Improve PNG support options + - S8219018: Adjust positions of glyphs + - S8219020: Table alternate substitutions + - S8219775: Certificate validation improvements + - S8220192: Better outlook for SecureRandom + - S8220517: Enhanced GIF support + - S8221518, CVE-2019-2816: Normalize normalization + - S8223511, CVE-2019-2842: Extended AES support +* Import of OpenJDK 7 u231 build 1 + - S7152169: TEST_BUG: sun/security/tools/jarsigner/ec.sh occasionally fail due to keytool error on sparc + - S7194075: Various classes of sunec.jar are duplicated in rt.jar + - S7198901: correct the field size check when decoding a point on ECC curve + - S8006799: Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() (jdk part of 6896617) + - S8031145: Re-examine closed i18n tests to see it they can be moved to the jdk repository. + - S8035974: Refactor DigestBase.engineUpdate() method for better code generation by JIT compiler + - S8135248: Add utility methods to check indexes and ranges + - S8142493: Utility methods to check indexes and ranges doesn't specify behavior when function produces null + - S8146458: Improve exception reporting for Objects.checkIndex/checkFromToIndex/checkFromIndexSize + - S8155794: Move Objects.checkIndex BiFunction accepting methods to an internal package + - S8159035: CTSMode.java test crashed due to unhandled case of cipher length value as 0 + - S8179098: Crypto AES/ECB encryption/decryption performance regression (introduced in jdk9b73) + - S8181594: Efficient and constant-time modular arithmetic + - S8182999: SunEC throws ProviderException on invalid curves + - S8187946: Support ISO 4217 Amendments 163 and 164 + - S8193552: ISO 4217 amendment 165 + - S8195478: sun/text/resources/LocaleDataTest.java fails with java.lang.Exception + - S8201317: X25519/X448 code improvements + - S8202026: ISO 4217 amendment 166 + - S8203228: Branch-free output conversion for X25519 and X448 + - S8204269: ISO 4217 amendment 167 + - S8208648: ECC Field Arithmetic Enhancements + - S8208746: ISO 4217 Amendment #168 update + - S8209775: ISO 4217 Amendment #169 update + - S8210153: localized currency symbol of VES + - S8211435: Exception in thread "AWT-EventQueue-1" java.lang.IllegalArgumentException: null source + - S8215982: (tz) Upgrade time-zone data to tzdata2018i + - S8218781: Localized names for Japanese era Reiwa in COMPAT provider + - S8224560: (tz) Upgrade time-zone data to tzdata2019a + - S8225580: tzdata2018i integration causes test failures on jdk-13 +* Bug fixes + - PR3729: CVE-2018-3639 fix revision to prefer PR_SPEC_DISABLE_NOEXEC to PR_SPEC_DISABLE +* AArch64 port + - S8149365, PR3741: aarch64: memory copy does not prefetch on backwards copy + - S8151340, PR3741: aarch64: prefetch the destination word for write prior to ldxr/stxr loops. + - S8153713, PR3741: aarch64: improve short array clearing using store pair + - S8153797, PR3741: aarch64: Add Arrays.fill stub code + - S8155617, PR3741: aarch64: ClearArray does not use DC ZVA + - S8157841, PR3741: aarch64: prefetch ignores cache line size + - S8186325, PR3741: AArch64: jtreg test hotspot/test/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java SEGV + - S8224671, PR3741: AArch64: mauve System.arraycopy test failure + - S8224828, PR3741: aarch64: rflags is not correct after safepoint poll + - S8224880, PR3741: AArch64: java/javac error with AllocatePrefetchDistance + New in release 2.6.18 (2019-05-01): * Security fixes - S8211936, CVE-2019-2602: Better String parsing - S8218453, CVE-2019-2684: More dynamic RMI interactions - S8219066, CVE-2019-2698: Fuzzing TrueType fonts: setCurrGlyphID() -* Import of OpenJDK 7 u211 build 1 +* Import of OpenJDK 7 u221 build 1 - S8003846: Override mechanism for currency data should not require creating currency.properties in java.home - S8129361: ISO 4217 amendment 160 - S8129822: Define "headful" jtreg keyword
--- a/acinclude.m4 Fri May 10 18:09:36 2019 +0100 +++ b/acinclude.m4 Wed Jul 17 16:53:58 2019 +0100 @@ -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=221 - BUILD_VERSION=b02 + JDK_UPDATE_VERSION=231 + BUILD_VERSION=b01 COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION} OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION} ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##')
--- a/configure.ac Fri May 10 18:09:36 2019 +0100 +++ b/configure.ac Wed Jul 17 16:53:58 2019 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.19pre00], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.6.19], [distro-pkg-dev@openjdk.java.net]) AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
--- a/hotspot.map.in Fri May 10 18:09:36 2019 +0100 +++ b/hotspot.map.in Wed Jul 17 16:53:58 2019 +0100 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop https://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6e7512a54bc6 8ce20d0c5a16373fe7bea5437d91a513b861788bd24d79ac04e43e73cb82eb54 +default drop https://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6774b8e70603 fbbfa17c95891491311758d2ef595ec322c46452e0bf7b51eb42a9ca1ccc419b
--- a/patches/boot/ecj-diamond.patch Fri May 10 18:09:36 2019 +0100 +++ b/patches/boot/ecj-diamond.patch Wed Jul 17 16:53:58 2019 +0100 @@ -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 2019-02-25 01:45:16.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2019-07-15 18:55:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2019-07-16 11:31:53.604330577 +0100 @@ -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 2019-03-12 20:04:51.069808655 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2019-07-16 11:29:36.526436414 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:16.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2019-07-15 18:55:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:16.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2019-07-15 18:55:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2019-07-16 11:31:53.608330515 +0100 @@ -103,7 +103,7 @@ Set<String> _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 2019-02-25 01:45:16.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2019-07-15 18:55:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2019-07-16 11:31:53.608330515 +0100 @@ -1323,7 +1323,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set<ObjectAdapterFactory> 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 2019-02-25 01:45:16.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2019-07-15 18:55:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2019-07-16 11:31:53.608330515 +0100 @@ -220,7 +220,7 @@ public Map<String, Object> 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2019-03-12 20:07:10.195622858 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2019-07-16 11:31:53.608330515 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2019-07-16 11:31:53.608330515 +0100 @@ -37,7 +37,7 @@ public final class MultiHashtable<K,V> { 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2019-03-12 20:07:10.199622796 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2019-07-16 11:31:53.612330454 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -38,7 +38,7 @@ static final Map<String, DatatypeValidator> 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2019-07-16 11:31:53.612330454 +0100 @@ -37,7 +37,7 @@ static Map<String, DatatypeValidator> 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2019-07-16 11:31:53.616330393 +0100 @@ -192,7 +192,7 @@ // caller to specify the location of the error being // reported. -Ac @@ -1144,8 +1144,8 @@ } // <init>() 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2019-07-16 11:31:53.616330393 +0100 @@ -374,8 +374,8 @@ static private Map<String, Token> 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2019-03-12 20:07:10.203622732 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2019-07-16 11:31:53.616330393 +0100 @@ -85,7 +85,7 @@ private static final Map<String, String> 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2019-07-16 11:31:53.616330393 +0100 @@ -294,7 +294,7 @@ // REVISIT: do well-formedness issues involving XML declaration <?xml ... ?> 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2019-07-16 11:31:53.616330393 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2019-07-16 11:31:53.616330393 +0100 @@ -144,7 +144,7 @@ Map<String, Integer> 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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2019-07-16 11:31:53.620330331 +0100 @@ -341,7 +341,7 @@ * vector. This allows the Catalog to quickly locate the reader * for a particular MIME type.</p> @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2019-07-16 11:31:53.620330331 +0100 @@ -78,7 +78,7 @@ * or "{namespaceuri}elementname". The former is used if the * namespace URI is null.</p> @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2019-07-16 11:31:53.620330331 +0100 @@ -89,7 +89,7 @@ * or "{namespaceuri}elementname". The former is used if the * namespace URI is null.</p> @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-03-12 20:04:51.069808655 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2019-07-16 11:29:36.526436414 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2019-03-12 20:07:10.207622670 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2019-07-15 18:55:33.000000000 +0100 ++++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:17.000000000 +0000 -+++ openjdk-boot/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java 2019-07-15 18:55:36.000000000 +0100 ++++ openjdk-boot/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2019-07-16 11:31:53.620330331 +0100 @@ -63,9 +63,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -1700,8 +1700,8 @@ private Reference<ClassLoader> 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2019-07-16 11:31:53.620330331 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-03-12 20:04:51.113807964 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2019-07-16 11:29:37.014428917 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-03-12 20:04:51.017809472 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2019-07-16 11:29:36.226441022 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2019-07-16 11:31:53.624330270 +0100 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-03-12 20:04:51.113807964 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2019-07-16 11:29:37.014428917 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2019-07-16 11:31:53.624330270 +0100 @@ -45,7 +45,7 @@ private final ArrayList<E> 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-03-12 20:04:51.017809472 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2019-03-12 20:07:10.211622606 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2019-07-16 11:29:36.230440962 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2019-07-16 11:31:53.624330270 +0100 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> 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 2019-03-12 20:04:51.113807964 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2019-07-16 11:29:37.018428856 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-03-12 20:04:51.117807900 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2019-07-16 11:29:37.018428856 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2019-07-16 11:31:53.624330270 +0100 @@ -181,8 +181,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-03-12 20:04:51.117807900 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2019-07-16 11:29:37.022428795 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2019-07-16 11:31:53.624330270 +0100 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> 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 2019-03-12 20:04:51.117807900 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2019-07-16 11:29:37.022428795 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-03-12 20:04:51.117807900 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2019-07-16 11:29:37.022428795 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2019-07-16 11:31:53.624330270 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java 2019-07-16 11:31:53.628330208 +0100 @@ -1093,7 +1093,7 @@ @SuppressWarnings("unchecked") public Hashtable<String, java.lang.Object> getEnvironment() throws NamingException { @@ -2565,8 +2565,8 @@ // copy-on-write _env = (Hashtable<String, java.lang.Object>)_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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-03-12 20:04:51.073808592 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java 2019-07-16 11:29:36.574435676 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java 2019-03-12 20:07:10.215622544 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java 2019-07-16 11:31:53.628330208 +0100 @@ -111,7 +111,7 @@ */ private LdapName(String name, Vector<Rdn> 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-03-12 20:04:51.117807900 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2019-07-16 11:29:37.026428732 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java 2019-07-16 11:31:53.628330208 +0100 @@ -84,7 +84,7 @@ private void init() { @@ -3054,8 +3054,8 @@ return (Hashtable<String, Object>)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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java 2019-07-16 11:31:53.628330208 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java 2019-07-16 11:31:53.628330208 +0100 @@ -510,7 +510,7 @@ @SuppressWarnings("unchecked") // clone() public Hashtable<String, Object> getEnvironment() throws NamingException { @@ -3078,8 +3078,8 @@ return (Hashtable<String, Object>)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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-03-12 20:04:51.073808592 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2019-07-16 11:29:36.590435431 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2019-07-16 11:31:53.632330146 +0100 @@ -97,7 +97,7 @@ */ // WeakHashMap<Class | ClassLoader, Hashtable> @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2019-03-12 20:07:10.219622481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2019-07-16 11:31:53.632330146 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2019-07-16 11:31:53.636330086 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -3373,8 +3373,8 @@ /** * Initialize this <code>LoginModule</code>. 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2019-07-16 11:31:53.636330086 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -3385,8 +3385,8 @@ /** * Initialize this <code>LoginModule</code>. 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/awt/Cursor.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/awt/EventQueue.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/awt/MenuBar.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java 2019-07-16 11:31:53.636330086 +0100 @@ -94,7 +94,7 @@ * @serial * @see #countMenus() @@ -3466,8 +3466,8 @@ for (int i = 0 ; i < nmenus ; i++) { Enumeration<MenuShortcut> 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/awt/Menu.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/awt/Menu.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/awt/Menu.java 2019-07-16 11:31:53.636330086 +0100 @@ -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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java 2019-03-12 20:07:10.223622418 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/awt/RenderingHints.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java 2019-07-16 11:31:53.636330086 +0100 @@ -92,7 +92,7 @@ * {@code equals()} method. */ @@ -3525,9 +3525,21 @@ /** * Antialiasing hint key. +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/SequencedEvent.java openjdk-boot/jdk/src/share/classes/java/awt/SequencedEvent.java +--- openjdk-boot.orig/jdk/src/share/classes/java/awt/SequencedEvent.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/awt/SequencedEvent.java 2019-07-16 11:31:53.700329102 +0100 +@@ -55,7 +55,7 @@ + private final AWTEvent nested; + private AppContext appContext; + private boolean disposed; +- private final LinkedList<AWTEvent> pendingEvents = new LinkedList<>(); ++ private final LinkedList<AWTEvent> pendingEvents = new LinkedList<AWTEvent>(); + + static { + AWTAccessor.setSequencedEventAccessor(new AWTAccessor.SequencedEventAccessor() { 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2019-07-16 11:31:53.636330086 +0100 @@ -106,7 +106,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -3556,8 +3568,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2019-07-16 11:31:53.636330086 +0100 @@ -44,7 +44,7 @@ } else { @@ -3577,8 +3589,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2019-07-16 11:31:53.636330086 +0100 @@ -96,7 +96,7 @@ BeanInfo putBeanInfo(Class<?> type, BeanInfo info) { @@ -3589,8 +3601,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2019-07-16 11:31:53.636330086 +0100 @@ -34,7 +34,7 @@ */ @@ -3610,8 +3622,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2019-07-16 11:31:53.636330086 +0100 @@ -61,7 +61,7 @@ private volatile boolean closed = false; @@ -3622,8 +3634,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2019-07-16 11:31:53.636330086 +0100 @@ -1150,7 +1150,7 @@ if ((names == null) || (filter == null)) { return names; @@ -3652,8 +3664,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2019-07-16 11:31:53.636330086 +0100 @@ -76,7 +76,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -3664,8 +3676,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2019-07-16 11:31:53.636330086 +0100 @@ -725,7 +725,7 @@ */ @@ -3694,8 +3706,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2019-07-16 11:31:53.636330086 +0100 @@ -220,7 +220,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -3720,8 +3732,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2019-07-16 11:31:53.640330023 +0100 @@ -166,11 +166,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -3746,8 +3758,8 @@ /** 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 2019-03-12 20:04:51.073808592 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2019-07-16 11:29:36.606435185 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2019-07-16 11:31:53.640330023 +0100 @@ -106,18 +106,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -3855,8 +3867,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2019-07-16 11:31:53.640330023 +0100 @@ -47,7 +47,7 @@ } } @@ -3867,8 +3879,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2019-07-16 11:31:53.640330023 +0100 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -3889,8 +3901,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2019-03-12 20:07:10.227622355 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2019-07-16 11:31:53.640330023 +0100 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -3901,8 +3913,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2019-07-16 11:31:53.640330023 +0100 @@ -1359,7 +1359,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -3955,8 +3967,8 @@ for (Map.Entry<Class<? extends Annotation>, 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2019-07-16 11:31:53.640330023 +0100 @@ -253,7 +253,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -4063,8 +4075,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2019-07-16 11:31:53.640330023 +0100 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -4106,8 +4118,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 2019-03-12 20:04:51.157807273 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2019-07-16 11:29:37.158426704 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2019-07-16 11:31:53.640330023 +0100 @@ -393,7 +393,7 @@ } private boolean isPlaceholder() { return clazz == null; } @@ -4118,8 +4130,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2019-07-16 11:31:53.640330023 +0100 @@ -290,7 +290,7 @@ if (UNSAFE.shouldBeInitialized(type)) // If the previous call didn't block, this can happen. @@ -4130,8 +4142,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 2019-03-12 20:04:51.157807273 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2019-07-16 11:29:37.158426704 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2019-07-16 11:31:53.640330023 +0100 @@ -129,7 +129,7 @@ static { @@ -4151,8 +4163,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 2019-03-12 20:04:51.157807273 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2019-07-16 11:29:37.158426704 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2019-07-16 11:31:53.640330023 +0100 @@ -468,12 +468,12 @@ int capacity = 512; // expect many distinct signatures over time float loadFactor = 0.75f; // normal default @@ -4169,8 +4181,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 2019-03-12 20:04:51.077808530 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2019-07-16 11:29:36.618435000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2019-07-16 11:31:53.644329963 +0100 @@ -808,14 +808,14 @@ // JVM returned to us with an intentional overflow! totalCount += buf.length; @@ -4189,8 +4201,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 2019-03-12 20:04:51.157807273 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2019-07-16 11:29:37.158426704 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2019-07-16 11:31:53.644329963 +0100 @@ -73,8 +73,8 @@ static final class ArrayAccessor { @@ -4212,8 +4224,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2019-07-16 11:31:53.644329963 +0100 @@ -834,7 +834,7 @@ } } @@ -4224,8 +4236,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2019-07-16 11:31:53.644329963 +0100 @@ -1953,7 +1953,7 @@ int inargs = outargs + dropped; if (pos < 0 || pos >= inargs) @@ -4236,8 +4248,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2019-07-16 11:31:53.644329963 +0100 @@ -1044,7 +1044,7 @@ private final float loadFactor; @@ -4248,8 +4260,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 2019-03-12 20:04:51.077808530 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2019-07-16 11:29:36.626434878 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2019-07-16 11:31:53.644329963 +0100 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -4260,8 +4272,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2019-07-16 11:31:53.644329963 +0100 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -4299,8 +4311,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 2019-03-12 20:04:51.117807900 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2019-07-16 11:29:37.026428732 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2019-07-16 11:31:53.644329963 +0100 @@ -599,13 +599,16 @@ } @@ -4322,8 +4334,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 2019-03-12 20:04:51.077808530 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2019-03-12 20:07:10.231622292 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2019-07-16 11:29:36.626434878 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2019-07-16 11:31:53.644329963 +0100 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -4343,8 +4355,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2019-07-16 11:31:53.644329963 +0100 @@ -137,7 +137,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -4355,8 +4367,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 2019-03-12 20:04:51.077808530 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2019-07-16 11:29:36.626434878 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2019-07-16 11:31:53.644329963 +0100 @@ -234,7 +234,7 @@ * a cache of proxy classes */ @@ -4376,8 +4388,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2019-07-16 11:31:53.644329963 +0100 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -4388,8 +4400,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2019-07-16 11:31:53.644329963 +0100 @@ -71,12 +71,12 @@ } @@ -4443,8 +4455,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2019-07-16 11:31:53.644329963 +0100 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -4458,8 +4470,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2019-07-16 11:31:53.644329963 +0100 @@ -2282,7 +2282,7 @@ int off = 0; int next = 0; @@ -4470,8 +4482,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2019-07-16 11:31:53.644329963 +0100 @@ -1641,7 +1641,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -4497,18 +4509,9 @@ /** 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2019-03-12 20:07:10.235622230 +0000 -@@ -918,7 +918,7 @@ - // Use the sentinel for a zero-length list - suppressed = SUPPRESSED_SENTINEL; - } else { // Copy Throwables to new list -- suppressed = new ArrayList<>(1); -+ suppressed = new ArrayList<Throwable>(1); - for (Throwable t : suppressedExceptions) { - // Enforce constraints on suppressed exceptions in - // case of corrupt or malicious stream. -@@ -1049,7 +1049,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2019-07-16 11:31:53.644329963 +0100 +@@ -1078,7 +1078,7 @@ return; if (suppressedExceptions == SUPPRESSED_SENTINEL) @@ -4518,8 +4521,8 @@ 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2019-07-16 11:31:53.648329901 +0100 @@ -734,7 +734,7 @@ static InetAddressImpl impl; @@ -4539,8 +4542,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/SocketPermission.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/SocketPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/SocketPermission.java 2019-07-16 11:31:53.648329901 +0100 @@ -1453,7 +1453,7 @@ // Don't call out.defaultWriteObject() @@ -4551,8 +4554,8 @@ 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2019-07-16 11:31:53.648329901 +0100 @@ -199,7 +199,7 @@ */ @@ -4563,8 +4566,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLConnection.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLConnection.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLConnection.java 2019-07-16 11:31:53.648329901 +0100 @@ -1237,7 +1237,7 @@ factory = fac; } @@ -4575,9 +4578,9 @@ /** * 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/URL.java 2019-03-12 20:07:10.235622230 +0000 -@@ -1126,7 +1126,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URL.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URL.java 2019-07-16 11:31:53.648329901 +0100 +@@ -1138,7 +1138,7 @@ /** * A table of protocol handlers. */ @@ -4587,8 +4590,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 2019-03-12 20:04:51.117807900 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2019-07-16 11:29:37.030428672 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2019-07-16 11:31:53.648329901 +0100 @@ -1504,7 +1504,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -4608,8 +4611,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 2019-03-12 20:04:51.093808278 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/FileTreeWalker.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/FileTreeWalker.java 2019-07-16 11:29:36.774432603 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/FileTreeWalker.java 2019-07-16 11:31:53.648329901 +0100 @@ -58,7 +58,7 @@ private final boolean followLinks; private final LinkOption[] linkOptions; @@ -4620,8 +4623,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2019-03-12 20:07:10.235622230 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2019-07-16 11:31:53.648329901 +0100 @@ -134,7 +134,7 @@ this.context = null; } @@ -4632,8 +4635,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2019-07-16 11:31:53.648329901 +0100 @@ -513,7 +513,7 @@ // Copy perms into a Hashtable @@ -4644,8 +4647,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2019-07-16 11:31:53.648329901 +0100 @@ -232,7 +232,7 @@ } else if (size < 0) { throw new IOException("size cannot be negative"); @@ -4656,8 +4659,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2019-07-16 11:31:53.648329901 +0100 @@ -189,7 +189,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -4690,8 +4693,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/KeyStore.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/KeyStore.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/KeyStore.java 2019-07-16 11:31:53.648329901 +0100 @@ -492,7 +492,7 @@ } @@ -4720,8 +4723,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2019-07-16 11:31:53.648329901 +0100 @@ -361,7 +361,7 @@ // Copy perms into a Hashtable @@ -4741,8 +4744,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2019-07-16 11:31:53.648329901 +0100 @@ -109,7 +109,7 @@ // PolicyInfo is stored in an AtomicReference @@ -4762,8 +4765,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2019-07-16 11:31:53.648329901 +0100 @@ -400,8 +400,8 @@ int swag = 32; int vcap = 8; @@ -4776,8 +4779,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2019-07-16 11:31:53.648329901 +0100 @@ -434,7 +434,7 @@ private void readObject(ObjectInputStream in) @@ -4806,8 +4809,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2019-07-16 11:31:53.648329901 +0100 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -4818,8 +4821,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2019-07-16 11:31:53.652329839 +0100 @@ -544,7 +544,7 @@ value = filter.substring(index + 1); } @@ -4866,8 +4869,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2019-07-16 11:31:53.652329839 +0100 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -4905,8 +4908,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2019-07-16 11:31:53.652329839 +0100 @@ -200,7 +200,7 @@ if (this.certs == null) { // extract the signer certs @@ -4928,8 +4931,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2019-07-16 11:31:53.652329839 +0100 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -4959,8 +4962,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2019-03-12 20:07:10.239622167 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2019-07-16 11:31:53.652329839 +0100 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -4971,9 +4974,9 @@ /** 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2019-03-12 20:07:10.239622167 +0000 -@@ -1035,7 +1035,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2019-07-16 11:32:25.979833212 +0100 +@@ -1038,7 +1038,7 @@ * @return an unmodifiable view of the specified collection. */ public static <T> Collection<T> unmodifiableCollection(Collection<? extends T> c) { @@ -4982,7 +4985,7 @@ } /** -@@ -1109,7 +1109,7 @@ +@@ -1112,7 +1112,7 @@ * @return an unmodifiable view of the specified set. */ public static <T> Set<T> unmodifiableSet(Set<? extends T> s) { @@ -4991,7 +4994,7 @@ } /** -@@ -1141,7 +1141,7 @@ +@@ -1144,7 +1144,7 @@ * @return an unmodifiable view of the specified sorted set. */ public static <T> SortedSet<T> unmodifiableSortedSet(SortedSet<T> s) { @@ -5000,7 +5003,7 @@ } /** -@@ -1158,13 +1158,13 @@ +@@ -1161,13 +1161,13 @@ public Comparator<? super E> comparator() {return ss.comparator();} public SortedSet<E> subSet(E fromElement, E toElement) { @@ -5017,7 +5020,7 @@ } public E first() {return ss.first();} -@@ -1188,8 +1188,8 @@ +@@ -1191,8 +1191,8 @@ */ public static <T> List<T> unmodifiableList(List<? extends T> list) { return (list instanceof RandomAccess ? @@ -5028,7 +5031,7 @@ } /** -@@ -1250,7 +1250,7 @@ +@@ -1253,7 +1253,7 @@ } public List<E> subList(int fromIndex, int toIndex) { @@ -5037,7 +5040,7 @@ } /** -@@ -1267,7 +1267,7 @@ +@@ -1270,7 +1270,7 @@ */ private Object readResolve() { return (list instanceof RandomAccess @@ -5046,7 +5049,7 @@ : this); } } -@@ -1283,7 +1283,7 @@ +@@ -1286,7 +1286,7 @@ } public List<E> subList(int fromIndex, int toIndex) { @@ -5055,7 +5058,7 @@ list.subList(fromIndex, toIndex)); } -@@ -1296,7 +1296,7 @@ +@@ -1299,7 +1299,7 @@ * deserialization. */ private Object writeReplace() { @@ -5064,7 +5067,7 @@ } } -@@ -1315,7 +1315,7 @@ +@@ -1318,7 +1318,7 @@ * @return an unmodifiable view of the specified map. */ public static <K,V> Map<K,V> unmodifiableMap(Map<? extends K, ? extends V> m) { @@ -5073,7 +5076,7 @@ } /** -@@ -1363,7 +1363,7 @@ +@@ -1366,7 +1366,7 @@ public Set<Map.Entry<K,V>> entrySet() { if (entrySet==null) @@ -5082,7 +5085,7 @@ return entrySet; } -@@ -1400,7 +1400,7 @@ +@@ -1403,7 +1403,7 @@ return i.hasNext(); } public Map.Entry<K,V> next() { @@ -5091,7 +5094,7 @@ } public void remove() { throw new UnsupportedOperationException(); -@@ -1411,7 +1411,7 @@ +@@ -1414,7 +1414,7 @@ public Object[] toArray() { Object[] a = c.toArray(); for (int i=0; i<a.length; i++) @@ -5100,7 +5103,7 @@ return a; } -@@ -1422,7 +1422,7 @@ +@@ -1425,7 +1425,7 @@ Object[] arr = c.toArray(a.length==0 ? a : Arrays.copyOf(a, 0)); for (int i=0; i<arr.length; i++) @@ -5109,7 +5112,7 @@ if (arr.length > a.length) return (T[])arr; -@@ -1443,7 +1443,7 @@ +@@ -1446,7 +1446,7 @@ if (!(o instanceof Map.Entry)) return false; return c.contains( @@ -5118,7 +5121,7 @@ } /** -@@ -1519,7 +1519,7 @@ +@@ -1522,7 +1522,7 @@ * @return an unmodifiable view of the specified sorted map. */ public static <K,V> SortedMap<K,V> unmodifiableSortedMap(SortedMap<K, ? extends V> m) { @@ -5127,7 +5130,7 @@ } /** -@@ -1537,13 +1537,13 @@ +@@ -1540,13 +1540,13 @@ public Comparator<? super K> comparator() {return sm.comparator();} public SortedMap<K,V> subMap(K fromKey, K toKey) { @@ -5144,7 +5147,7 @@ } public K firstKey() {return sm.firstKey();} -@@ -1585,11 +1585,11 @@ +@@ -1588,11 +1588,11 @@ * @return a synchronized view of the specified collection. */ public static <T> Collection<T> synchronizedCollection(Collection<T> c) { @@ -5158,7 +5161,7 @@ } /** -@@ -1688,11 +1688,11 @@ +@@ -1691,11 +1691,11 @@ * @return a synchronized view of the specified set. */ public static <T> Set<T> synchronizedSet(Set<T> s) { @@ -5172,7 +5175,7 @@ } /** -@@ -1758,7 +1758,7 @@ +@@ -1761,7 +1761,7 @@ * @return a synchronized view of the specified sorted set. */ public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> s) { @@ -5181,7 +5184,7 @@ } /** -@@ -1787,18 +1787,18 @@ +@@ -1790,18 +1790,18 @@ public SortedSet<E> subSet(E fromElement, E toElement) { synchronized (mutex) { @@ -5203,7 +5206,7 @@ } } -@@ -1837,14 +1837,14 @@ +@@ -1840,14 +1840,14 @@ */ public static <T> List<T> synchronizedList(List<T> list) { return (list instanceof RandomAccess ? @@ -5222,7 +5225,7 @@ } /** -@@ -1909,7 +1909,7 @@ +@@ -1912,7 +1912,7 @@ public List<E> subList(int fromIndex, int toIndex) { synchronized (mutex) { @@ -5231,7 +5234,7 @@ mutex); } } -@@ -1928,7 +1928,7 @@ +@@ -1931,7 +1931,7 @@ */ private Object readResolve() { return (list instanceof RandomAccess @@ -5240,7 +5243,7 @@ : this); } } -@@ -1950,7 +1950,7 @@ +@@ -1953,7 +1953,7 @@ public List<E> subList(int fromIndex, int toIndex) { synchronized (mutex) { @@ -5249,7 +5252,7 @@ list.subList(fromIndex, toIndex), mutex); } } -@@ -1964,7 +1964,7 @@ +@@ -1967,7 +1967,7 @@ * deserialization. */ private Object writeReplace() { @@ -5258,7 +5261,7 @@ } } -@@ -1996,7 +1996,7 @@ +@@ -1999,7 +1999,7 @@ * @return a synchronized view of the specified map. */ public static <K,V> Map<K,V> synchronizedMap(Map<K,V> m) { @@ -5267,7 +5270,7 @@ } /** -@@ -2057,7 +2057,7 @@ +@@ -2060,7 +2060,7 @@ public Set<K> keySet() { synchronized (mutex) { if (keySet==null) @@ -5276,7 +5279,7 @@ return keySet; } } -@@ -2065,7 +2065,7 @@ +@@ -2068,7 +2068,7 @@ public Set<Map.Entry<K,V>> entrySet() { synchronized (mutex) { if (entrySet==null) @@ -5285,7 +5288,7 @@ return entrySet; } } -@@ -2073,7 +2073,7 @@ +@@ -2076,7 +2076,7 @@ public Collection<V> values() { synchronized (mutex) { if (values==null) @@ -5294,7 +5297,7 @@ return values; } } -@@ -2137,7 +2137,7 @@ +@@ -2140,7 +2140,7 @@ * @return a synchronized view of the specified sorted map. */ public static <K,V> SortedMap<K,V> synchronizedSortedMap(SortedMap<K,V> m) { @@ -5303,7 +5306,7 @@ } -@@ -2167,18 +2167,18 @@ +@@ -2170,18 +2170,18 @@ public SortedMap<K,V> subMap(K fromKey, K toKey) { synchronized (mutex) { @@ -5325,7 +5328,7 @@ } } -@@ -2254,7 +2254,7 @@ +@@ -2257,7 +2257,7 @@ */ public static <E> Collection<E> checkedCollection(Collection<E> c, Class<E> type) { @@ -5334,7 +5337,7 @@ } @SuppressWarnings("unchecked") -@@ -2386,7 +2386,7 @@ +@@ -2389,7 +2389,7 @@ * @since 1.5 */ public static <E> Set<E> checkedSet(Set<E> s, Class<E> type) { @@ -5343,7 +5346,7 @@ } /** -@@ -2432,7 +2432,7 @@ +@@ -2435,7 +2435,7 @@ */ public static <E> SortedSet<E> checkedSortedSet(SortedSet<E> s, Class<E> type) { @@ -5352,7 +5355,7 @@ } /** -@@ -2492,8 +2492,8 @@ +@@ -2495,8 +2495,8 @@ */ public static <E> List<E> checkedList(List<E> list, Class<E> type) { return (list instanceof RandomAccess ? @@ -5363,7 +5366,7 @@ } /** -@@ -2558,7 +2558,7 @@ +@@ -2561,7 +2561,7 @@ } public List<E> subList(int fromIndex, int toIndex) { @@ -5372,7 +5375,7 @@ } } -@@ -2575,7 +2575,7 @@ +@@ -2578,7 +2578,7 @@ } public List<E> subList(int fromIndex, int toIndex) { @@ -5381,7 +5384,7 @@ list.subList(fromIndex, toIndex), type); } } -@@ -2617,7 +2617,7 @@ +@@ -2620,7 +2620,7 @@ public static <K, V> Map<K, V> checkedMap(Map<K, V> m, Class<K> keyType, Class<V> valueType) { @@ -5390,7 +5393,7 @@ } -@@ -2685,14 +2685,15 @@ +@@ -2688,14 +2688,15 @@ // - protection from malicious t // - correct behavior if t is a concurrent map Object[] entries = t.entrySet().toArray(); @@ -5408,7 +5411,7 @@ } for (Map.Entry<K,V> e : checked) m.put(e.getKey(), e.getValue()); -@@ -2702,7 +2703,7 @@ +@@ -2705,7 +2706,7 @@ public Set<Map.Entry<K,V>> entrySet() { if (entrySet==null) @@ -5417,7 +5420,7 @@ return entrySet; } -@@ -2817,7 +2818,7 @@ +@@ -2820,7 +2821,7 @@ if (!(o instanceof Map.Entry)) return false; return s.remove(new AbstractMap.SimpleImmutableEntry @@ -5426,7 +5429,7 @@ } public boolean removeAll(Collection<?> c) { -@@ -2850,7 +2851,7 @@ +@@ -2853,7 +2854,7 @@ static <K,V,T> CheckedEntry<K,V,T> checkedEntry(Map.Entry<K,V> e, Class<T> valueType) { @@ -5435,7 +5438,7 @@ } /** -@@ -2891,7 +2892,7 @@ +@@ -2894,7 +2895,7 @@ if (!(o instanceof Map.Entry)) return false; return e.equals(new AbstractMap.SimpleImmutableEntry @@ -5444,7 +5447,7 @@ } } } -@@ -2934,7 +2935,7 @@ +@@ -2937,7 +2938,7 @@ public static <K,V> SortedMap<K,V> checkedSortedMap(SortedMap<K, V> m, Class<K> keyType, Class<V> valueType) { @@ -5453,7 +5456,7 @@ } /** -@@ -3000,7 +3001,7 @@ +@@ -3003,7 +3004,7 @@ private static class EmptyIterator<E> implements Iterator<E> { static final EmptyIterator<Object> EMPTY_ITERATOR @@ -5462,7 +5465,7 @@ public boolean hasNext() { return false; } public E next() { throw new NoSuchElementException(); } -@@ -3049,7 +3050,7 @@ +@@ -3052,7 +3053,7 @@ implements ListIterator<E> { static final EmptyListIterator<Object> EMPTY_ITERATOR @@ -5471,7 +5474,7 @@ public boolean hasPrevious() { return false; } public E previous() { throw new NoSuchElementException(); } -@@ -3085,7 +3086,7 @@ +@@ -3088,7 +3089,7 @@ private static class EmptyEnumeration<E> implements Enumeration<E> { static final EmptyEnumeration<Object> EMPTY_ENUMERATION @@ -5480,7 +5483,7 @@ public boolean hasMoreElements() { return false; } public E nextElement() { throw new NoSuchElementException(); } -@@ -3097,7 +3098,7 @@ +@@ -3100,7 +3101,7 @@ * @see #emptySet() */ @SuppressWarnings("unchecked") @@ -5489,7 +5492,7 @@ /** * Returns the empty set (immutable). This set is serializable. -@@ -3157,7 +3158,7 @@ +@@ -3160,7 +3161,7 @@ * @see #emptyList() */ @SuppressWarnings("unchecked") @@ -5498,7 +5501,7 @@ /** * Returns the empty list (immutable). This list is serializable. -@@ -3231,7 +3232,7 @@ +@@ -3234,7 +3235,7 @@ * @since 1.3 */ @SuppressWarnings("unchecked") @@ -5507,7 +5510,7 @@ /** * Returns the empty map (immutable). This map is serializable. -@@ -3293,7 +3294,7 @@ +@@ -3296,7 +3297,7 @@ * @return an immutable set containing only the specified object. */ public static <T> Set<T> singleton(T o) { @@ -5516,7 +5519,7 @@ } static <E> Iterator<E> singletonIterator(final E e) { -@@ -3346,7 +3347,7 @@ +@@ -3349,7 +3350,7 @@ * @since 1.3 */ public static <T> List<T> singletonList(T o) { @@ -5525,7 +5528,7 @@ } /** -@@ -3388,7 +3389,7 @@ +@@ -3391,7 +3392,7 @@ * @since 1.3 */ public static <K,V> Map<K,V> singletonMap(K key, V value) { @@ -5534,7 +5537,7 @@ } /** -@@ -3430,7 +3431,7 @@ +@@ -3433,7 +3434,7 @@ public Set<Map.Entry<K,V>> entrySet() { if (entrySet==null) entrySet = Collections.<Map.Entry<K,V>>singleton( @@ -5543,7 +5546,7 @@ return entrySet; } -@@ -3462,7 +3463,7 @@ +@@ -3465,7 +3466,7 @@ public static <T> List<T> nCopies(int n, T o) { if (n < 0) throw new IllegalArgumentException("List length = " + n); @@ -5552,16 +5555,16 @@ } /** -@@ -3536,7 +3537,7 @@ +@@ -3539,7 +3540,7 @@ if (fromIndex > toIndex) throw new IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")"); - return new CopiesList<>(toIndex - fromIndex, element); + return new CopiesList<E>(toIndex - fromIndex, element); } - } - -@@ -3604,7 +3605,7 @@ + + private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { +@@ -3612,7 +3613,7 @@ if (cmp instanceof ReverseComparator2) return ((ReverseComparator2<T>)cmp).cmp; @@ -5570,7 +5573,7 @@ } /** -@@ -3683,7 +3684,7 @@ +@@ -3691,7 +3692,7 @@ * @see ArrayList */ public static <T> ArrayList<T> list(Enumeration<T> e) { @@ -5579,7 +5582,7 @@ while (e.hasMoreElements()) l.add(e.nextElement()); return l; -@@ -3876,7 +3877,7 @@ +@@ -3884,7 +3885,7 @@ * @since 1.6 */ public static <E> Set<E> newSetFromMap(Map<E, Boolean> map) { @@ -5588,7 +5591,7 @@ } /** -@@ -3940,7 +3941,7 @@ +@@ -3948,7 +3949,7 @@ * @since 1.6 */ public static <T> Queue<T> asLifoQueue(Deque<T> deque) { @@ -5598,9 +5601,9 @@ /** 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 2019-03-12 20:04:51.121807838 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2019-03-12 20:07:10.243622104 +0000 -@@ -101,7 +101,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2019-07-16 11:29:37.030428672 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2019-07-16 11:31:53.652329839 +0100 +@@ -102,7 +102,7 @@ // class data: instance map @@ -5610,8 +5613,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2019-07-16 11:31:53.652329839 +0100 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -5622,8 +5625,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2019-07-16 11:31:53.652329839 +0100 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -5646,8 +5649,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 2019-03-12 20:04:51.077808530 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2019-07-16 11:29:36.630434816 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2019-07-16 11:31:53.652329839 +0100 @@ -2531,7 +2531,7 @@ * Finds format specifiers in the format string. */ @@ -5658,8 +5661,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2019-07-16 11:31:53.656329778 +0100 @@ -895,7 +895,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -5670,8 +5673,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2019-07-16 11:31:53.656329778 +0100 @@ -104,7 +104,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -5718,8 +5721,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2019-07-16 11:31:53.656329778 +0100 @@ -539,7 +539,7 @@ // Creates the new entry. @@ -5775,8 +5778,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2019-07-16 11:31:53.656329778 +0100 @@ -1142,7 +1142,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -5796,8 +5799,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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/Attributes.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/Attributes.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/Attributes.java 2019-07-16 11:31:53.656329778 +0100 @@ -71,7 +71,7 @@ * @param size the initial number of attributes */ @@ -5817,8 +5820,8 @@ 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 2019-03-12 20:04:51.121807838 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2019-07-16 11:29:37.034428609 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2019-07-16 11:31:53.656329778 +0100 @@ -185,7 +185,7 @@ } else { man = new Manifest(super.getInputStream(manEntry)); @@ -5829,8 +5832,8 @@ } 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 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarVerifier.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarVerifier.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarVerifier.java 2019-07-16 11:31:53.656329778 +0100 @@ -95,12 +95,12 @@ public JarVerifier(byte rawBytes[]) { @@ -5948,8 +5951,8 @@ } return jarCodeSigners; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/Manifest.java openjdk-boot/jdk/src/share/classes/java/util/jar/Manifest.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/Manifest.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/Manifest.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/Manifest.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/Manifest.java 2019-07-16 11:31:53.656329778 +0100 @@ -51,7 +51,7 @@ private final Attributes attr = new Attributes(); @@ -5960,8 +5963,8 @@ // associated JarVerifier, not null when called by JarFile::getManifest. private final JarVerifier jv; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2019-07-16 11:31:53.656329778 +0100 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -5972,8 +5975,8 @@ private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2019-07-16 11:31:53.656329778 +0100 @@ -238,7 +238,7 @@ */ @Override @@ -5993,8 +5996,8 @@ e.addBefore(header); size++; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2019-07-16 11:31:53.656329778 +0100 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -6032,8 +6035,8 @@ first = newNode; else diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2019-07-16 11:31:53.656329778 +0100 @@ -187,7 +187,7 @@ return; @@ -6044,8 +6047,8 @@ // key must be non-null String, value must be non-null String key = (String) contents[i][0]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java openjdk-boot/jdk/src/share/classes/java/util/Locale.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2019-07-16 11:31:53.656329778 +0100 @@ -1807,7 +1807,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -6056,8 +6059,8 @@ names.add(languageName); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2019-07-16 11:31:53.656329778 +0100 @@ -128,7 +128,7 @@ private File files[]; private static final int DEFAULT_MAX_LOCKS = 100; @@ -6068,8 +6071,8 @@ /* * Initialize maxLocks from the System property if set. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2019-03-12 20:07:10.243622104 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2019-07-16 11:31:53.656329778 +0100 @@ -524,8 +524,8 @@ // were final, the following KnownLevel implementation can be removed. // Future API change should take this into consideration. @@ -6099,8 +6102,8 @@ } list.add(o); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2019-07-16 11:31:53.656329778 +0100 @@ -177,7 +177,7 @@ private volatile LogManager manager; private String name; @@ -6120,8 +6123,8 @@ if (ref == null) { // we didn't have a previous parent diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2019-07-16 11:31:53.656329778 +0100 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -6132,8 +6135,8 @@ for (; loggers.hasMoreElements();) { array.add((String) loggers.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2019-07-16 11:31:53.656329778 +0100 @@ -389,7 +389,7 @@ // find the AppContext of the applet code // will be null if we are in the main app context. @@ -6189,8 +6192,8 @@ int end = ix; while (end < hands.length()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2019-07-16 11:31:53.656329778 +0100 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -6211,8 +6214,8 @@ params.add(in.readObject()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2019-07-16 11:31:53.660329717 +0100 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -6243,8 +6246,8 @@ /** * These two classes are used to distinguish NodeChangeEvents on diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/XmlSupport.java openjdk-boot/jdk/src/share/classes/java/util/prefs/XmlSupport.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/XmlSupport.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/XmlSupport.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/XmlSupport.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/XmlSupport.java 2019-07-16 11:31:53.660329717 +0100 @@ -106,7 +106,7 @@ xmlRoot.setAttribute("type", (p.isUserNode() ? "user" : "system")); @@ -6255,8 +6258,8 @@ for (Preferences kid = p, dad = kid.parent(); dad != null; kid = dad, dad = kid.parent()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2019-07-16 11:31:53.660329717 +0100 @@ -540,7 +540,7 @@ cursor--; else { @@ -6267,8 +6270,8 @@ } } else if (lastRetElt != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java openjdk-boot/jdk/src/share/classes/java/util/Properties.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2019-07-16 11:31:53.660329717 +0100 @@ -1005,7 +1005,7 @@ * @since 1.6 */ @@ -6279,8 +6282,8 @@ return h.keySet(); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2019-07-16 11:31:53.660329717 +0100 @@ -321,7 +321,7 @@ * <td headers="matches">Nothing, but quotes all characters until <tt>\E</tt></td></tr> * <tr><td valign="top" headers="construct quot"><tt>\E</tt></td> @@ -6318,8 +6321,8 @@ static { // Unicode character property aliases, defined in diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2019-07-16 11:31:53.660329717 +0100 @@ -193,8 +193,8 @@ } }; @@ -6332,8 +6335,8 @@ posix.put("ALPHA", "ALPHABETIC"); posix.put("LOWER", "LOWERCASE"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2019-07-16 11:31:53.660329717 +0100 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -6344,8 +6347,8 @@ private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2019-07-16 11:31:53.660329717 +0100 @@ -291,7 +291,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -6410,8 +6413,8 @@ if (variants != null) { for (String v : variants) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2019-07-16 11:31:53.660329717 +0100 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -6440,8 +6443,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java openjdk-boot/jdk/src/share/classes/java/util/TimSort.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2019-07-16 11:31:53.660329717 +0100 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -6452,8 +6455,8 @@ do { // Identify next run diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2019-03-12 20:07:10.247622041 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2019-07-16 11:31:53.660329717 +0100 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -6509,8 +6512,8 @@ // color nodes in non-full bottommost level red if (level == redLevel) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2019-07-16 11:31:53.660329717 +0100 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -6578,8 +6581,8 @@ // Read in size diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2019-07-16 11:31:53.660329717 +0100 @@ -172,7 +172,7 @@ /** * Reference queue for cleared WeakEntries @@ -6612,8 +6615,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2019-07-16 11:31:53.660329717 +0100 @@ -336,7 +336,7 @@ // the outstanding inputstreams that need to be closed, @@ -6642,8 +6645,8 @@ for (Map.Entry<InputStream, Inflater> e : copy.entrySet()) { e.getKey().close(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2019-07-16 11:31:53.660329717 +0100 @@ -53,8 +53,8 @@ } @@ -6656,8 +6659,8 @@ private long written = 0; private long locoff = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/Cipher.java openjdk-boot/jdk/src/share/classes/javax/crypto/Cipher.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/Cipher.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/Cipher.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/Cipher.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/Cipher.java 2019-07-16 11:31:53.664329655 +0100 @@ -416,7 +416,7 @@ return Collections.singletonList(tr); } else { // if ((mode != null) && (pad != null)) { @@ -6677,8 +6680,8 @@ cipherServices.add(new ServiceId("Cipher", transform.transform)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java 2019-07-16 11:31:53.664329655 +0100 @@ -172,7 +172,7 @@ * @return an enumeration of all the CryptoAllPermission objects. */ @@ -6689,8 +6692,8 @@ return v.elements(); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2019-07-16 11:31:53.664329655 +0100 @@ -84,7 +84,7 @@ * no CryptoPermissionCollections. */ @@ -6738,8 +6741,8 @@ fields.put("perms", permTable); s.writeFields(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java 2019-07-16 11:31:53.664329655 +0100 @@ -252,7 +252,7 @@ // AlgorithmParameterSpec class name. String algParamSpecClassName = match("quoted string"); @@ -6768,8 +6771,8 @@ processedPermissions.put(alg, exemptionMechanisms); return true; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurity.java openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurity.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurity.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurity.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurity.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurity.java 2019-07-16 11:31:53.664329655 +0100 @@ -60,11 +60,11 @@ // value == PROVIDER_VERIFIED is successfully verified // value is failure cause Exception in error case @@ -6794,8 +6797,8 @@ /* * Returns the CodeBase for the given class. diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2019-07-16 11:31:53.664329655 +0100 @@ -52,9 +52,9 @@ private static final CryptoPermissions exemptPolicy; private static final CryptoAllPermission allPerm; @@ -6809,8 +6812,8 @@ new CryptoPermissions(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java openjdk-boot/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java 2019-07-16 11:31:53.664329655 +0100 @@ -698,7 +698,8 @@ // Class -> Provider Object of that class @@ -6822,8 +6825,8 @@ public SubRegistry(ServiceRegistry registry, Class category) { this.registry = registry; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java openjdk-boot/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2019-07-16 11:31:53.664329655 +0100 @@ -103,7 +103,7 @@ = (String[]) this.env.get(EnvHelp.CREDENTIAL_TYPES); List<String> types = null; @@ -6834,8 +6837,8 @@ if (type == null) { throw new IllegalArgumentException("A credential type is null."); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java openjdk-boot/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java 2019-07-16 11:31:53.664329655 +0100 @@ -255,7 +255,7 @@ */ public BasicAttribute(String id, boolean ordered) { @@ -6855,8 +6858,8 @@ values.addElement(s.readObject()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java openjdk-boot/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java 2019-07-16 11:31:53.664329655 +0100 @@ -79,7 +79,7 @@ // If ignoreCase is true, key is aways lowercase. // If ignoreCase is false, key is stored as supplied by put(). @@ -6867,8 +6870,8 @@ /** * Constructs a new instance of Attributes. diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java openjdk-boot/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java 2019-07-16 11:31:53.664329655 +0100 @@ -137,7 +137,7 @@ // Clone environment since caller owns it. @@ -6879,8 +6882,8 @@ // Put connect controls into environment. Copy them first since diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/LdapName.java openjdk-boot/jdk/src/share/classes/javax/naming/ldap/LdapName.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/LdapName.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/LdapName.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/LdapName.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/LdapName.java 2019-07-16 11:31:53.664329655 +0100 @@ -142,7 +142,7 @@ // "Invalid entries, list entries must be of type Rdn"); // } @@ -6900,8 +6903,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/Rdn.java openjdk-boot/jdk/src/share/classes/javax/naming/ldap/Rdn.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/Rdn.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/Rdn.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/Rdn.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/Rdn.java 2019-07-16 11:31:53.664329655 +0100 @@ -130,7 +130,7 @@ if (attrSet.size() == 0) { throw new InvalidNameException("Attributes cannot be empty"); @@ -6957,8 +6960,8 @@ try { (new Rfc2253Parser(unparsed)).parseRdn(this); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java openjdk-boot/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java 2019-07-16 11:31:53.664329655 +0100 @@ -61,7 +61,7 @@ // new ArrayList<Rdn>(len / 3 + 10); // leave room for growth @@ -6969,8 +6972,8 @@ if (len == 0) { return rdns; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/NameImpl.java openjdk-boot/jdk/src/share/classes/javax/naming/NameImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/NameImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/NameImpl.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/NameImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/NameImpl.java 2019-07-16 11:31:53.664329655 +0100 @@ -272,7 +272,7 @@ if (syntax != null) { recordNamingConvention(syntax); @@ -6981,8 +6984,8 @@ NameImpl(Properties syntax, String n) throws InvalidNameException { diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/Reference.java openjdk-boot/jdk/src/share/classes/javax/naming/Reference.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/Reference.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/Reference.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/Reference.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/Reference.java 2019-07-16 11:31:53.664329655 +0100 @@ -120,7 +120,7 @@ */ public Reference(String className) { @@ -7011,8 +7014,8 @@ while (a.hasMoreElements()) r.addrs.addElement(a.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java openjdk-boot/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java 2019-07-16 11:31:53.664329655 +0100 @@ -90,7 +90,7 @@ Hashtable<Object,Object> env = (Hashtable<Object,Object>)cpe.getEnvironment(); @@ -7023,8 +7026,8 @@ // Make a (shallow) copy of the environment. env = (Hashtable<Object,Object>) env.clone(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/naming/spi/NamingManager.java openjdk-boot/jdk/src/share/classes/javax/naming/spi/NamingManager.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/naming/spi/NamingManager.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/naming/spi/NamingManager.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/naming/spi/NamingManager.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/naming/spi/NamingManager.java 2019-07-16 11:31:53.664329655 +0100 @@ -777,7 +777,7 @@ Hashtable<Object,Object> env = (Hashtable<Object,Object>)cpe.getEnvironment(); @@ -7035,8 +7038,8 @@ // Make a (shallow) copy of the environment. env = (Hashtable<Object,Object>)env.clone(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2019-03-12 20:07:10.251621979 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2019-07-16 11:31:53.664329655 +0100 @@ -116,7 +116,7 @@ return null; } @@ -7047,8 +7050,8 @@ while (itr.hasNext()) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2019-07-16 11:31:53.664329655 +0100 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -7059,8 +7062,8 @@ synchronized (this) { permissions.addAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2019-07-16 11:31:53.664329655 +0100 @@ -590,7 +590,7 @@ // Don't call out.defaultWriteObject() @@ -7071,8 +7074,8 @@ synchronized (this) { permissions.addAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2019-07-16 11:31:53.664329655 +0100 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -7083,8 +7086,8 @@ String principalClass = null; String principalName = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2019-07-16 11:31:53.664329655 +0100 @@ -50,7 +50,7 @@ private Subject subject; @@ -7095,8 +7098,8 @@ private Principal[] principals; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2019-07-16 11:31:53.664329655 +0100 @@ -267,7 +267,7 @@ private static Collection<JInternalFrame> getAllFrames(Container parent) { @@ -7107,8 +7110,8 @@ for (i = 0; i < count; i++) { Component next = parent.getComponent(i); diff -Nru openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java ---- openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2019-07-16 11:31:53.664329655 +0100 @@ -58,7 +58,7 @@ public class Sockets { @@ -7155,8 +7158,8 @@ set.add(StandardSocketOptions.SO_RCVBUF); set.add(StandardSocketOptions.SO_REUSEADDR); diff -Nru openjdk-boot.orig/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java openjdk-boot/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java ---- openjdk-boot.orig/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java 2019-03-12 20:04:51.021809410 +0000 -+++ openjdk-boot/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java 2019-07-16 11:29:36.250440654 +0100 ++++ openjdk-boot/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Policy.java 2019-07-16 11:31:53.668329594 +0100 @@ -46,11 +46,11 @@ public final class Policy { @@ -7173,8 +7176,8 @@ private static boolean noRMLoops = false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java openjdk-boot/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java 2019-07-16 11:31:53.668329594 +0100 @@ -96,7 +96,7 @@ // IM preference stuff private static final String preferredIMNode = "/sun/awt/im/preferredInputMethod"; @@ -7185,8 +7188,8 @@ ExecutableInputMethodManager() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/awt/im/InputContext.java openjdk-boot/jdk/src/share/classes/sun/awt/im/InputContext.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/awt/im/InputContext.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/awt/im/InputContext.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/awt/im/InputContext.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/awt/im/InputContext.java 2019-07-16 11:31:53.668329594 +0100 @@ -552,10 +552,10 @@ // keep the input method instance around for future use @@ -7210,8 +7213,8 @@ perInputMethodState.put(requester, Boolean.valueOf(enable)); return; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2019-07-16 11:31:53.668329594 +0100 @@ -109,7 +109,7 @@ * Note that this only applies to createFont() from an InputStream object. */ @@ -7222,8 +7225,8 @@ private static Thread t = null; static void init() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2019-03-12 20:04:51.161807209 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2019-07-16 11:29:37.162426644 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2019-07-16 11:31:53.668329594 +0100 @@ -60,7 +60,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap<?,?>[n]; @@ -7261,8 +7264,8 @@ MethodHandle mh = findCollector("list", mhs.size(), List.class); if (mh == null) break; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2019-07-16 11:31:53.668329594 +0100 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -7273,8 +7276,8 @@ aliasTable.put("us-ascii", "ASCII"); aliasTable.put("ascii", "ASCII"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java openjdk-boot/jdk/src/share/classes/sun/io/Converters.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2019-07-16 11:31:53.668329594 +0100 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -7285,8 +7288,8 @@ return c; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2019-07-16 11:31:53.668329594 +0100 @@ -61,7 +61,7 @@ TagCache(LCMSProfile p) { @@ -7297,8 +7300,8 @@ TagData getTag(int sig) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2019-03-12 20:04:51.121807838 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2019-07-16 11:29:37.038428549 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2019-07-16 11:31:53.668329594 +0100 @@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -7336,8 +7339,8 @@ System.err.println("Incoming arguments:"); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ConnectorAddressLink.java openjdk-boot/jdk/src/share/classes/sun/management/ConnectorAddressLink.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ConnectorAddressLink.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ConnectorAddressLink.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ConnectorAddressLink.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ConnectorAddressLink.java 2019-07-16 11:31:53.668329594 +0100 @@ -168,7 +168,7 @@ throw new IOException(iae.getMessage()); } @@ -7348,8 +7351,8 @@ String name = c.getName(); if (name.startsWith(REMOTE_CONNECTOR_COUNTER_PREFIX) && diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java openjdk-boot/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java 2019-07-16 11:31:53.668329594 +0100 @@ -73,7 +73,7 @@ buffer.position(prologue.getEntryOffset()); nextEntry = buffer.position(); @@ -7378,8 +7381,8 @@ for (Map.Entry<String,Counter> me: map.entrySet()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/Flag.java openjdk-boot/jdk/src/share/classes/sun/management/Flag.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/Flag.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/Flag.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/Flag.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/Flag.java 2019-07-16 11:31:53.668329594 +0100 @@ -91,7 +91,7 @@ Flag[] flags = new Flag[numFlags]; int count = getFlags(names, flags, numFlags); @@ -7390,8 +7393,8 @@ if (f != null) { result.add(f); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java openjdk-boot/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java 2019-03-12 20:04:51.081808466 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java 2019-07-16 11:29:36.646434571 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java 2019-07-16 11:31:53.668329594 +0100 @@ -141,7 +141,7 @@ GC_INFO }; @@ -7402,8 +7405,8 @@ public static String getGcName(CompositeData cd) { String gcname = getString(cd, GC_NAME); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/HotspotCompilation.java openjdk-boot/jdk/src/share/classes/sun/management/HotspotCompilation.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/HotspotCompilation.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/HotspotCompilation.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/HotspotCompilation.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/HotspotCompilation.java 2019-07-16 11:31:53.668329594 +0100 @@ -136,7 +136,7 @@ private void initCompilerCounters() { @@ -7423,8 +7426,8 @@ if (threads[0] == null) { // no adaptor thread diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java openjdk-boot/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2019-07-16 11:31:53.668329594 +0100 @@ -69,7 +69,7 @@ public List<VMOption> getDiagnosticOptions() { @@ -7435,8 +7438,8 @@ if (flag.isWriteable() && flag.isExternal()) { result.add(flag.getVMOption()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/HotspotThread.java openjdk-boot/jdk/src/share/classes/sun/management/HotspotThread.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/HotspotThread.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/HotspotThread.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/HotspotThread.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/HotspotThread.java 2019-07-16 11:31:53.668329594 +0100 @@ -58,7 +58,7 @@ String[] names = new String[count]; long[] times = new long[count]; @@ -7447,8 +7450,8 @@ result.put(names[i], new Long(times[i])); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2019-07-16 11:31:53.668329594 +0100 @@ -120,7 +120,7 @@ String key = null, value = null; @@ -7459,8 +7462,8 @@ while (true) { key = getEntry(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java 2019-03-12 20:04:51.121807838 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java 2019-07-16 11:29:37.058428241 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java 2019-07-16 11:31:53.668329594 +0100 @@ -244,7 +244,7 @@ } } @@ -7498,8 +7501,8 @@ PermanentExporter exporter = new PermanentExporter(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2019-03-12 20:07:10.255621915 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2019-07-16 11:31:53.668329594 +0100 @@ -110,7 +110,7 @@ public static List<MemoryPoolMXBean> getMemoryPoolMXBeans() { @@ -7537,8 +7540,8 @@ .getDirectBufferPool())); bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/MappedMXBeanType.java openjdk-boot/jdk/src/share/classes/sun/management/MappedMXBeanType.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/MappedMXBeanType.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/MappedMXBeanType.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/MappedMXBeanType.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/MappedMXBeanType.java 2019-07-16 11:31:53.668329594 +0100 @@ -62,7 +62,7 @@ @SuppressWarnings("unchecked") public abstract class MappedMXBeanType { @@ -7605,8 +7608,8 @@ /* Select public methods that look like "T getX()" or "boolean isX()", where T is not void and X is not the empty diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java openjdk-boot/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java 2019-07-16 11:31:53.668329594 +0100 @@ -71,7 +71,7 @@ efficient solution would be to clone the listener list every time a notification is sent. */ @@ -7635,8 +7638,8 @@ for (int i = 0; i < size; i++) { ListenerInfo li = newList.get(i); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/RuntimeImpl.java openjdk-boot/jdk/src/share/classes/sun/management/RuntimeImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/RuntimeImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/RuntimeImpl.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/RuntimeImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/RuntimeImpl.java 2019-07-16 11:31:53.668329594 +0100 @@ -128,7 +128,7 @@ public Map<String,String> getSystemProperties() { @@ -7647,8 +7650,8 @@ // Properties.entrySet() does not include the entries in // the default properties. So use Properties.stringPropertyNames() diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/misc/ExtensionDependency.java openjdk-boot/jdk/src/share/classes/sun/misc/ExtensionDependency.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/misc/ExtensionDependency.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/misc/ExtensionDependency.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/misc/ExtensionDependency.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/misc/ExtensionDependency.java 2019-07-16 11:31:53.668329594 +0100 @@ -83,7 +83,7 @@ (ExtensionInstallationProvider eip) { @@ -7659,8 +7662,8 @@ providers.add(eip); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/misc/JarIndex.java openjdk-boot/jdk/src/share/classes/sun/misc/JarIndex.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/misc/JarIndex.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/misc/JarIndex.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/misc/JarIndex.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/misc/JarIndex.java 2019-07-16 11:31:53.668329594 +0100 @@ -81,8 +81,8 @@ * Constructs a new, empty jar index. */ @@ -7691,8 +7694,8 @@ /* read until we see a .jar line */ while((line = br.readLine()) != null && !line.endsWith(".jar")); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/misc/ObjectInputFilter.java openjdk-boot/jdk/src/share/classes/sun/misc/ObjectInputFilter.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/misc/ObjectInputFilter.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/misc/ObjectInputFilter.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/misc/ObjectInputFilter.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/misc/ObjectInputFilter.java 2019-07-16 11:31:53.668329594 +0100 @@ -444,7 +444,7 @@ maxStreamBytes = Long.MAX_VALUE; @@ -7703,8 +7706,8 @@ String p = patterns[i]; int nameLen = p.length(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/misc/ProxyGenerator.java openjdk-boot/jdk/src/share/classes/sun/misc/ProxyGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/misc/ProxyGenerator.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/misc/ProxyGenerator.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/misc/ProxyGenerator.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/misc/ProxyGenerator.java 2019-07-16 11:31:53.668329594 +0100 @@ -1642,7 +1642,8 @@ /** descriptor of same method */ public String unwrapMethodDesc; @@ -7734,8 +7737,8 @@ /** true if no new constant pool entries may be added */ private boolean readOnly = false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/misc/Service.java openjdk-boot/jdk/src/share/classes/sun/misc/Service.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/misc/Service.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/misc/Service.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/misc/Service.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/misc/Service.java 2019-07-16 11:31:53.672329532 +0100 @@ -216,7 +216,7 @@ { InputStream in = null; @@ -7755,8 +7758,8 @@ private LazyIterator(Class<S> service, ClassLoader loader) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/misc/Signal.java openjdk-boot/jdk/src/share/classes/sun/misc/Signal.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/misc/Signal.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/misc/Signal.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/misc/Signal.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/misc/Signal.java 2019-07-16 11:31:53.672329532 +0100 @@ -72,8 +72,8 @@ * @since 1.2 */ @@ -7769,8 +7772,8 @@ private int number; private String name; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/RegisteredDomain.java openjdk-boot/jdk/src/share/classes/sun/net/RegisteredDomain.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/RegisteredDomain.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/RegisteredDomain.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/RegisteredDomain.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/RegisteredDomain.java 2019-07-16 11:31:53.672329532 +0100 @@ -118,8 +118,8 @@ private static Set<String> usSubStateSet = new HashSet<String>(Arrays.asList("state", "lib", "k12", "cc", "tec", "gen", "cog", "mus", "dst")); @@ -7783,8 +7786,8 @@ static { /* diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2019-07-16 11:31:53.672329532 +0100 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -7813,8 +7816,8 @@ // do the query diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/TransferProtocolClient.java openjdk-boot/jdk/src/share/classes/sun/net/TransferProtocolClient.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/TransferProtocolClient.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/TransferProtocolClient.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/TransferProtocolClient.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/TransferProtocolClient.java 2019-07-16 11:31:53.672329532 +0100 @@ -42,7 +42,7 @@ /** Array of strings (usually 1 entry) for the last reply @@ -7825,8 +7828,8 @@ /** code for last reply */ protected int lastReplyCode; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java 2019-07-16 11:31:53.672329532 +0100 @@ -139,7 +139,7 @@ this.dontUseNegotiate = dontUseNegotiate; this.rsp = response; @@ -7837,8 +7840,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2019-07-16 11:31:53.672329532 +0100 @@ -120,7 +120,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -7849,9 +7852,9 @@ /* check if a request for this destination is in progress * return false immediately if not. Otherwise block until diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2019-03-12 20:04:51.085808403 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2019-03-12 20:07:10.259621853 +0000 -@@ -224,7 +224,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2019-07-16 11:29:36.674434140 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2019-07-16 11:31:53.672329532 +0100 +@@ -225,7 +225,7 @@ if (list == null || list.isEmpty()) return Collections.emptySet(); @@ -7860,7 +7863,7 @@ String[] parts = list.split("\\s*,\\s*"); for (String part : parts) s.add(part.toLowerCase(Locale.ROOT)); -@@ -2790,7 +2790,7 @@ +@@ -2796,7 +2796,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -7869,7 +7872,7 @@ if (cachedHeaders != null) headers = cachedHeaders.getHeaders(); -@@ -2799,7 +2799,7 @@ +@@ -2805,7 +2805,7 @@ for (Map.Entry<String, List<String>> e: headers.entrySet()) { String key = e.getKey(); @@ -7878,7 +7881,7 @@ for (String value : values) { String fVal = filterHeaderField(key, value); if (fVal != null) -@@ -2981,7 +2981,7 @@ +@@ -2987,7 +2987,7 @@ */ Map<String, List<String>> userCookiesMap = null; if (userCookies != null || userCookies2 != null) { @@ -7888,8 +7891,8 @@ userCookiesMap.put("Cookie", Arrays.asList(userCookies)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java 2019-07-16 11:31:53.672329532 +0100 @@ -128,7 +128,7 @@ */ private static synchronized boolean isSupportedImpl(HttpCallerInfo hci) { @@ -7909,8 +7912,8 @@ }; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2019-07-16 11:31:53.672329532 +0100 @@ -234,7 +234,7 @@ url = null; } @@ -7921,8 +7924,8 @@ public synchronized static void setProxiedHost(String host) { proxiedHosts.put(host.toLowerCase(), null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2019-07-16 11:31:53.672329532 +0100 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -7960,8 +7963,8 @@ return new Iterator<Charset>() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2019-07-16 11:31:53.672329532 +0100 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -7972,8 +7975,8 @@ result.put(ACL_NAME, getAcl()); if (owner) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2019-07-16 11:31:53.672329532 +0100 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -7986,8 +7989,8 @@ private AttributesBuilder(Set<String> allowed, String[] requested) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2019-07-16 11:31:53.672329532 +0100 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -7998,8 +8001,8 @@ // standard events if (event == StandardWatchEventKinds.ENTRY_CREATE || diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2019-07-16 11:31:53.672329532 +0100 @@ -77,7 +77,7 @@ throws IOException { @@ -8019,8 +8022,8 @@ int size = size(name); byte[] buf = new byte[size]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2019-07-16 11:31:53.672329532 +0100 @@ -71,7 +71,7 @@ @Override @@ -8031,8 +8034,8 @@ if (attribute.equals("*") || attribute.equals(OWNER_NAME)) { result.put(OWNER_NAME, getOwner()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2019-07-16 11:31:53.672329532 +0100 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -8052,8 +8055,8 @@ set.add(e); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java openjdk-boot/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2019-03-12 20:04:51.021809410 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2019-03-12 20:07:10.259621853 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2019-07-16 11:29:36.254440593 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2019-07-16 11:31:53.672329532 +0100 @@ -442,7 +442,7 @@ Map<String, Class<?>> memberTypes = annotationType.memberTypes(); @@ -8064,8 +8067,8 @@ // If there are annotation members without values, that // situation is handled by the invoke method. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2019-07-16 11:31:53.672329532 +0100 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -8130,8 +8133,8 @@ ets.add(parseThrowsSignature()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2019-07-16 11:31:53.672329532 +0100 @@ -84,9 +84,9 @@ /* indicate compatibility with JDK 1.1.x version of class */ private static final long serialVersionUID = 4666870661827494597L; @@ -8145,8 +8148,8 @@ private static ObjID id = new ObjID(ObjID.REGISTRY_ID); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2019-07-16 11:31:53.672329532 +0100 @@ -160,7 +160,7 @@ } @@ -8157,8 +8160,8 @@ /** * Remember a generated source file generated so that it diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2019-07-16 11:31:53.672329532 +0100 @@ -184,7 +184,7 @@ destDir = null; flags = F_WARNINGS; @@ -8178,8 +8181,8 @@ // Pre-process command line for @file arguments try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2019-07-16 11:31:53.672329532 +0100 @@ -61,7 +61,7 @@ */ public class RMIGenerator implements RMIConstants, Generator { @@ -8199,8 +8202,8 @@ uniqueList.addElement(defRuntimeException); uniqueList.addElement(defRemoteException); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2019-03-12 20:04:51.085808403 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2019-07-16 11:29:36.682434018 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2019-07-16 11:31:53.672329532 +0100 @@ -66,10 +66,10 @@ /** maps persistent IDs to activated remote objects */ @@ -8215,8 +8218,8 @@ /** * Creates a default activation group implementation. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2019-03-12 20:04:51.125807775 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2019-07-16 11:29:37.110427443 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2019-07-16 11:31:53.676329470 +0100 @@ -149,10 +149,10 @@ /** maps activation id to its respective group id */ @@ -8273,8 +8276,8 @@ /* * Parse arguments diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2019-03-12 20:04:51.085808403 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2019-07-16 11:29:36.682434018 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2019-07-16 11:31:53.676329470 +0100 @@ -114,11 +114,11 @@ * garbage collected. */ @@ -8299,8 +8302,8 @@ /** * Convert an array of URL objects into a corresponding string diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2019-07-16 11:31:53.676329470 +0100 @@ -76,14 +76,14 @@ /** table to hold sun classes to which access is explicitly permitted */ @@ -8319,9 +8322,9 @@ /** * if true, load classes (if not available locally) only from the diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2019-03-12 20:04:51.085808403 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2019-03-12 20:07:10.263621790 +0000 -@@ -580,7 +580,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2019-07-16 11:29:36.686433955 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2019-07-16 11:31:53.676329470 +0100 +@@ -581,7 +581,7 @@ HashToMethod_Maps() {} protected Map<Long,Method> computeValue(Class<?> remoteClass) { @@ -8331,8 +8334,8 @@ cl != null; cl = cl.getSuperclass()) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2019-07-16 11:31:53.676329470 +0100 @@ -208,7 +208,7 @@ * @throws NullPointerException if remoteClass is null */ @@ -8343,8 +8346,8 @@ return list.toArray(new Class<?>[list.size()]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2019-07-16 11:31:53.676329470 +0100 @@ -46,7 +46,7 @@ **/ public abstract class WeakClassHashMap<V> { @@ -8355,8 +8358,8 @@ protected WeakClassHashMap() { } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2019-07-16 11:31:53.676329470 +0100 @@ -43,7 +43,7 @@ private boolean dgcAckNeeded = false; @@ -8367,8 +8370,8 @@ /** identifier for gc ack*/ private UID ackID; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2019-07-16 11:31:53.676329470 +0100 @@ -78,7 +78,7 @@ Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>()); @@ -8379,8 +8382,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2019-07-16 11:31:53.676329470 +0100 @@ -197,9 +197,9 @@ private DGC dgc; @@ -8452,8 +8455,8 @@ private boolean dirtyFailed = false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2019-07-16 11:31:53.676329470 +0100 @@ -94,7 +94,7 @@ /** remote implementation of DGC interface for this VM */ private static DGCImpl dgc; @@ -8482,8 +8485,8 @@ LeaseInfo(VMID vmid, long lease) { this.vmid = vmid; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2019-07-16 11:31:53.676329470 +0100 @@ -62,9 +62,9 @@ /** tables mapping to Target, keyed from ObjectEndpoint and impl object */ @@ -8506,8 +8509,8 @@ /** handle for GC latency request (for future cancellation) */ private static GC.LatencyRequest gcLatencyRequest = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2019-07-16 11:31:53.676329470 +0100 @@ -116,7 +116,7 @@ /* construct table mapping command strings to handlers */ private static Hashtable<String, CGICommandHandler> commandLookup; @@ -8518,8 +8521,8 @@ commandLookup.put(commands[i].getName(), commands[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2019-03-12 20:04:51.125807775 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2019-07-16 11:29:37.110427443 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2019-07-16 11:31:53.676329470 +0100 @@ -76,13 +76,13 @@ /** table of hosts successfully connected to and the factory used */ @@ -8546,8 +8549,8 @@ try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2019-07-16 11:31:53.676329470 +0100 @@ -54,10 +54,10 @@ /** stub for remote object */ private final Remote stub; @@ -8562,8 +8565,8 @@ private final AccessControlContext acc; /** context class loader in which target was created */ diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2019-07-16 11:31:53.676329470 +0100 @@ -86,7 +86,7 @@ private DataOutputStream dataOut; @@ -8574,8 +8577,8 @@ /** number of currently open connections */ private int numConnections = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2019-07-16 11:31:53.676329470 +0100 @@ -64,7 +64,7 @@ private final TCPTransport tr; /** list of cached connections */ @@ -8595,8 +8598,8 @@ /** thread ID counter */ private static int threadNum = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2019-03-12 20:04:51.085808403 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2019-03-12 20:07:10.263621790 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2019-07-16 11:29:36.698433772 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2019-07-16 11:31:53.676329470 +0100 @@ -148,7 +148,7 @@ // TBD: should this be a weak hash table? private static final @@ -8607,8 +8610,8 @@ /** * Create an endpoint for a specified host and port. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2019-07-16 11:31:53.676329470 +0100 @@ -129,7 +129,7 @@ /** client host for the current thread's connection */ @@ -8628,8 +8631,8 @@ static final RMISocketFactory defaultSocketFactory = RMISocketFactory.getDefaultSocketFactory(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2019-07-16 11:31:53.676329470 +0100 @@ -67,7 +67,7 @@ Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel); @@ -8640,8 +8643,8 @@ /** ObjID for DGCImpl */ private static final ObjID dgcID = new ObjID(ObjID.DGC_ID); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2019-07-16 11:31:53.676329470 +0100 @@ -36,7 +36,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -8652,8 +8655,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2019-07-16 11:31:53.676329470 +0100 @@ -41,15 +41,15 @@ // or principal. // @@ -8694,8 +8697,8 @@ while (e1.hasMoreElements()) v.addElement(e1.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2019-07-16 11:31:53.676329470 +0100 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -8714,9 +8717,27 @@ return isMemberRecurse(member, alreadySeen); } } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ec/ECOperations.java openjdk-boot/jdk/src/share/classes/sun/security/ec/ECOperations.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ec/ECOperations.java 2019-07-16 12:26:43.053778829 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ec/ECOperations.java 2019-07-16 12:27:28.333082608 +0100 +@@ -62,12 +62,12 @@ + static final Map<BigInteger, IntegerFieldModuloP> orderFields; + + static { +- Map<BigInteger, IntegerFieldModuloP> map = new HashMap<>(); ++ Map<BigInteger, IntegerFieldModuloP> map = new HashMap<BigInteger, IntegerFieldModuloP>(); + map.put(IntegerPolynomialP256.MODULUS, new IntegerPolynomialP256()); + map.put(IntegerPolynomialP384.MODULUS, new IntegerPolynomialP384()); + map.put(IntegerPolynomialP521.MODULUS, new IntegerPolynomialP521()); + fields = Collections.unmodifiableMap(map); +- map = new HashMap<>(); ++ map = new HashMap<BigInteger, IntegerFieldModuloP>(); + map.put(P256OrderField.MODULUS, new P256OrderField()); + map.put(P384OrderField.MODULUS, new P384OrderField()); + map.put(P521OrderField.MODULUS, new P521OrderField()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2019-07-16 11:31:53.676329470 +0100 @@ -97,7 +97,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -8754,8 +8775,8 @@ ids.add(new ServiceId(type, alg)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2019-07-16 11:31:53.676329470 +0100 @@ -37,7 +37,7 @@ public class Providers { @@ -8766,8 +8787,8 @@ // number of threads currently using thread-local provider lists // tracked to allow an optimization if == 0 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2019-07-16 11:31:53.676329470 +0100 @@ -251,7 +251,7 @@ } @@ -8778,8 +8799,8 @@ keys.add(k); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2019-03-12 20:04:51.021809410 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2019-07-16 11:29:36.258440530 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2019-07-16 11:31:53.680329410 +0100 @@ -610,7 +610,7 @@ } }))); @@ -8857,8 +8878,8 @@ for (int i = 0; i < len; i++) { type = getType(st.nextToken()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2019-07-16 11:31:53.680329410 +0100 @@ -173,7 +173,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -8869,8 +8890,8 @@ temp.putInteger(BigInteger.valueOf(authenticator_vno)); v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2019-07-16 11:31:53.680329410 +0100 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -8881,8 +8902,8 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2019-03-12 20:04:51.125807775 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2019-07-16 11:29:37.114427380 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2019-07-16 11:31:53.680329410 +0100 @@ -569,7 +569,7 @@ private static String exec(String c) { @@ -8893,8 +8914,8 @@ v.addElement(st.nextToken()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2019-07-16 11:31:53.680329410 +0100 @@ -257,7 +257,7 @@ + configName); } @@ -8905,8 +8926,8 @@ if (EncryptionKey.findKey(answer[i], keys) != null) { list.add(answer[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2019-07-16 11:31:53.680329410 +0100 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -8917,8 +8938,8 @@ v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), ctime.asn1Encode())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2019-07-16 11:31:53.680329410 +0100 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -8938,8 +8959,8 @@ for (int i = 0; i < addresses.length; i++) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2019-07-16 11:31:53.680329410 +0100 @@ -165,7 +165,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -8968,8 +8989,8 @@ if (msgType == Krb5.KRB_AS_REQ) { if (cname != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2019-07-16 11:31:53.680329410 +0100 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -8980,8 +9001,8 @@ v.addElement(new PAData(subsubDer.getData().getDerValue())); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2019-07-16 11:31:53.680329410 +0100 @@ -150,7 +150,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -8992,8 +9013,8 @@ if (pname != null) { v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), pname.getRealm().asn1Encode())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2019-07-16 11:31:53.680329410 +0100 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -9004,8 +9025,8 @@ v.addElement(new Ticket(subsubDer.getData().getDerValue())); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2019-07-16 11:31:53.680329410 +0100 @@ -249,7 +249,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -9016,8 +9037,8 @@ // read the PA-DATA DerValue tmp = derPA.data.getDerValue(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2019-03-12 20:04:51.125807775 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2019-07-16 11:29:37.114427380 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2019-07-16 11:31:53.680329410 +0100 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -9055,8 +9076,8 @@ for (int i = entries.size()-1; i >= 0; i--) { KeyTabEntry e = entries.get(i); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2019-07-16 11:31:53.680329410 +0100 @@ -77,7 +77,7 @@ */ @@ -9067,8 +9088,8 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2019-03-12 20:04:51.125807775 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2019-07-16 11:29:37.114427380 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2019-07-16 11:31:53.680329410 +0100 @@ -468,7 +468,7 @@ */ static class KdcAccessibility { @@ -9091,8 +9112,8 @@ String t = st.nextToken(); if (bads.contains(t)) badkdcs.add(t); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java 2019-07-16 11:31:53.680329410 +0100 @@ -85,7 +85,7 @@ // the initial context constructor. This avoids having the initial // context constructor call itself (when processing the URL @@ -9112,8 +9133,8 @@ return null; // cannot create a DNS context } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2019-03-12 20:04:51.085808403 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2019-07-16 11:29:36.702433711 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2019-07-16 11:31:53.680329410 +0100 @@ -265,7 +265,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -9133,8 +9154,8 @@ int i = 0; int componentStart = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2019-03-12 20:07:10.267621727 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2019-07-16 11:31:53.680329410 +0100 @@ -375,7 +375,7 @@ return null; } @@ -9154,8 +9175,8 @@ // Un-common ones for client side for (int i=0; i<=cPos; i++) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java openjdk-boot/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java 2019-07-16 11:31:53.680329410 +0100 @@ -268,7 +268,7 @@ if (userCert == null) return null; @@ -9166,8 +9187,8 @@ X509Certificate[] pkcsCerts = block.getCertificates(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2019-07-16 11:31:53.680329410 +0100 @@ -254,7 +254,7 @@ this.keyId = keyId; this.alias = alias; @@ -9223,8 +9244,8 @@ entry.attributes.addAll(attributes); if (alias == null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java 2019-07-16 11:31:53.680329410 +0100 @@ -167,7 +167,7 @@ // successful step? If there's only one entry without // a throwable, then that's the successful step. Otherwise, @@ -9235,8 +9256,8 @@ if (v.getThrowable() == null) possibles.add(v); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/Builder.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/Builder.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/Builder.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/Builder.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/Builder.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/Builder.java 2019-07-16 11:31:53.680329410 +0100 @@ -399,7 +399,7 @@ (!initialPolicies.contains(PolicyChecker.ANY_POLICY)) && (buildParams.policyMappingInhibited())) @@ -9247,8 +9268,8 @@ } else { // we just return an empty set to make sure that there is diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java 2019-03-12 20:04:51.089808341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java 2019-07-16 11:29:36.710433588 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java 2019-07-16 11:31:53.680329410 +0100 @@ -51,7 +51,7 @@ public abstract class CertStoreHelper { @@ -9259,8 +9280,8 @@ classMap.put( "LDAP", diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java 2019-07-16 11:31:53.680329410 +0100 @@ -122,7 +122,7 @@ // Tolerate a few ConcurrentModificationExceptions for (int c = 0; c < 10; c++) { @@ -9280,8 +9301,8 @@ for (Object o : coll) { if ((o instanceof CRL) && selector.match((CRL) o)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2019-03-12 20:04:51.089808341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2019-07-16 11:29:36.714433526 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2019-07-16 11:31:53.684329348 +0100 @@ -146,7 +146,7 @@ } List<DistributionPoint> points = @@ -9337,8 +9358,8 @@ X500Name fullName = new X500Name(rdns.toArray(new RDN[0])); GeneralNames fullNames = new GeneralNames(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java 2019-07-16 11:31:53.684329348 +0100 @@ -122,7 +122,7 @@ * As each cert is added, it is sorted based on the PKIXCertComparator * algorithm. @@ -9349,8 +9370,8 @@ /* * Only look for EE certs if search has just started. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java 2019-07-16 11:31:53.684329348 +0100 @@ -180,7 +180,7 @@ if (cert.equals(oldEntry)) { return; @@ -9440,8 +9461,8 @@ return matches; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2019-03-12 20:04:51.089808341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2019-07-16 11:29:36.730433279 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2019-07-16 11:31:53.684329348 +0100 @@ -309,7 +309,7 @@ // responses @@ -9471,8 +9492,8 @@ for (DerValue extDerVal : extDer) { Extension ext = new Extension(extDerVal); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java 2019-03-12 20:04:51.089808341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java 2019-07-16 11:29:36.730433279 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java 2019-07-16 11:31:53.684329348 +0100 @@ -172,7 +172,7 @@ int certPathLen = params.certificates().size(); @@ -9483,8 +9504,8 @@ certPathCheckers.add(untrustedChecker); certPathCheckers.add(new AlgorithmChecker(anchor, null, params.date(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java 2019-07-16 11:31:53.684329348 +0100 @@ -136,7 +136,7 @@ // Reverse the ordering for validation so that the target // cert is the last certificate @@ -9504,8 +9525,8 @@ } return stores; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIXRevocationChecker.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIXRevocationChecker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIXRevocationChecker.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIXRevocationChecker.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PKIXRevocationChecker.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PKIXRevocationChecker.java 2019-07-16 11:31:53.684329348 +0100 @@ -188,7 +188,7 @@ if (responses == null) { this.ocspStapled = Collections.<X509Certificate, byte[]>emptyMap(); @@ -9545,8 +9566,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java 2019-07-16 11:31:53.684329348 +0100 @@ -431,7 +431,7 @@ boolean policiesCritical = false; List<PolicyInformation> policyInfo; @@ -9584,8 +9605,8 @@ PolicyNodeImpl curNode = new PolicyNodeImpl diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java 2019-07-16 11:31:53.684329348 +0100 @@ -300,7 +300,7 @@ * @return a <code>Set</code> of all nodes at the specified depth */ @@ -9614,8 +9635,8 @@ if (mDepth < depth) { for (PolicyNodeImpl node : mChildren) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java 2019-07-16 11:31:53.684329348 +0100 @@ -178,7 +178,7 @@ sel.setBasicConstraints(-2); @@ -9644,8 +9665,8 @@ reverseCertList.add(0, c); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java 2019-07-16 11:31:53.684329348 +0100 @@ -189,7 +189,7 @@ certIndex = 1; @@ -9665,8 +9686,8 @@ for (PKIXCertPathChecker checker : userCheckers) { checker.init(false); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java 2019-03-12 20:04:51.089808341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java 2019-07-16 11:29:36.730433279 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java 2019-07-16 11:31:53.684329348 +0100 @@ -144,7 +144,7 @@ this.anchor = anchor; @@ -9706,8 +9727,8 @@ badKeys.add(prevKey); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java 2019-07-16 11:31:53.684329348 +0100 @@ -138,7 +138,7 @@ if (selector == null) { return certs; @@ -9718,8 +9739,8 @@ if (selector.match(cert)) { matchedCerts.add(cert); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java 2019-03-12 20:04:51.089808341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java 2019-07-16 11:29:36.730433279 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java 2019-07-16 11:31:53.684329348 +0100 @@ -131,7 +131,7 @@ } @@ -9757,8 +9778,8 @@ = new PolicyChecker(buildParams.initialPolicies(), appendedCerts.size(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2019-03-12 20:04:51.125807775 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2019-07-16 11:29:37.114427380 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2019-07-16 11:31:53.684329348 +0100 @@ -340,7 +340,7 @@ if (selector == null) { return certs; @@ -9769,8 +9790,8 @@ if (selector.match(cert)) { matchedCerts.add(cert); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java 2019-03-12 20:04:51.021809410 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java 2019-03-12 20:07:10.271621664 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java 2019-07-16 11:29:36.270440346 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java 2019-07-16 11:31:53.684329348 +0100 @@ -82,7 +82,7 @@ private static final Collection<String> encodingList; @@ -9781,8 +9802,8 @@ list.add(PKCS7_ENCODING); encodingList = Collections.unmodifiableCollection(list); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2019-07-16 11:31:53.684329348 +0100 @@ -696,7 +696,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -9793,8 +9814,8 @@ for (int j = 0; j < numOfCerts; j++) { if (xVersion == 2) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2019-07-16 11:31:53.684329348 +0100 @@ -1324,7 +1324,7 @@ List<PolicyParser.PrincipalEntry> entryPs = entry.getPrincipals(); @@ -9841,8 +9862,8 @@ while (i < certs.length) { signerCerts.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2019-07-16 11:31:53.684329348 +0100 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -9853,8 +9874,8 @@ AccessController.doPrivileged(new PutAllAction(this, map)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2019-07-16 11:31:53.684329348 +0100 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -9865,8 +9886,8 @@ SunRsaSignEntries.putEntries(map); AccessController.doPrivileged(new PutAllAction(this, map)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2019-07-16 11:31:53.684329348 +0100 @@ -431,7 +431,7 @@ int peekByte; byte[] data; @@ -9922,8 +9943,8 @@ } catch (ParsingException e) { while (data != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2019-07-16 11:31:53.684329348 +0100 @@ -57,7 +57,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -9934,8 +9955,8 @@ private RSACore() { // empty diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2019-07-16 11:31:53.684329348 +0100 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -9946,8 +9967,8 @@ AccessController.doPrivileged(new PutAllAction(this, map)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2019-07-16 11:31:53.688329287 +0100 @@ -814,7 +814,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -9985,8 +10006,8 @@ subAltDnsNames.add(subAltDnsName); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/DHCrypt.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/DHCrypt.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2019-07-16 11:31:53.688329287 +0100 @@ -493,7 +493,7 @@ } } @@ -9997,8 +10018,8 @@ Matcher syntaxMatcher = syntaxPattern.matcher(property); if (syntaxMatcher.matches()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2019-03-12 20:04:49.193838129 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2019-07-16 11:29:32.546497556 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2019-07-16 11:31:53.688329287 +0100 @@ -50,12 +50,12 @@ private static final int ARBITRARY_CHAR2 = 0xff02; @@ -10043,8 +10064,8 @@ if (constraints.permits( EnumSet.of(CryptoPrimitive.KEY_AGREEMENT), diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java 2019-07-16 11:31:53.688329287 +0100 @@ -92,7 +92,7 @@ } @@ -10055,8 +10076,8 @@ list.add(toString(format)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ExtensionType.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ExtensionType.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ExtensionType.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ExtensionType.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ExtensionType.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ExtensionType.java 2019-07-16 11:31:53.688329287 +0100 @@ -42,7 +42,7 @@ return name; } @@ -10067,8 +10088,8 @@ static ExtensionType get(int id) { for (ExtensionType ext : knownExtensions) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2019-03-12 20:04:51.025809346 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2019-07-16 11:29:36.274440286 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2019-07-16 11:31:53.688329287 +0100 @@ -258,7 +258,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -10106,8 +10127,8 @@ private static void digestKey(MessageDigest md, SecretKey key) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2019-03-12 20:04:51.089808341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2019-07-16 11:29:36.738433157 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2019-07-16 11:31:53.688329287 +0100 @@ -597,7 +597,7 @@ activeProtocols = getActiveProtocols(); } @@ -10127,8 +10148,8 @@ EnumSet.<CryptoPrimitive>of(CryptoPrimitive.KEY_AGREEMENT); for (ProtocolVersion protocol : enabledProtocols.collection()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeStateManager.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeStateManager.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeStateManager.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeStateManager.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeStateManager.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeStateManager.java 2019-07-16 11:31:53.688329287 +0100 @@ -216,7 +216,7 @@ static { debugIsOn = (Handshaker.debug != null) && @@ -10159,8 +10180,8 @@ "Handshake message sequence violation, " + handshakeType; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2019-07-16 11:31:53.688329287 +0100 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -10171,8 +10192,8 @@ ProtocolVersion version = ProtocolVersion.valueOf(names[i]); if (versions.contains(version) == false) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2019-07-16 11:31:53.688329287 +0100 @@ -106,7 +106,7 @@ // Initialize the available protocols. @@ -10183,8 +10204,8 @@ ProtocolVersion[] pvs = new ProtocolVersion[] { SSL20Hello, SSL30, TLS10, TLS11, TLS12}; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2019-07-16 11:31:53.688329287 +0100 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -10222,8 +10243,8 @@ for (SignatureAndHashAlgorithm sigAlg : algorithms) { if (sigAlg.hash.value > 0) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2019-03-12 20:07:10.275621601 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2019-07-16 11:31:53.688329287 +0100 @@ -48,7 +48,7 @@ } @@ -10261,8 +10282,8 @@ if (keyExchange != null) { components.addAll(decomposes(keyExchange)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2019-03-12 20:10:16.444696713 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2019-07-16 11:31:53.688329287 +0100 @@ -322,7 +322,7 @@ Collection<CipherSuite> allowedCipherSuites, ProtocolList protocols, int minPriority) { @@ -10327,8 +10348,8 @@ if ((certs != null) && (certs.length > 0)){ Collections.addAll(trustedCerts, certs); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2019-07-16 11:31:53.688329287 +0100 @@ -661,7 +661,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -10348,8 +10369,8 @@ Object securityCtx = SecureKey.getCurrentSecurityContext(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2019-07-16 11:31:53.688329287 +0100 @@ -2544,7 +2544,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -10360,8 +10381,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2019-07-16 11:31:53.688329287 +0100 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -10381,8 +10402,8 @@ Principal p = principals[i]; if (p instanceof X500Principal) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2019-07-16 11:31:53.688329287 +0100 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -10393,8 +10414,8 @@ KeyStore ks = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2019-03-12 20:04:51.025809346 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2019-07-16 11:29:36.274440286 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2019-07-16 11:31:53.688329287 +0100 @@ -310,7 +310,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -10414,8 +10435,8 @@ return null; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2019-03-12 20:04:51.125807775 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2019-03-12 20:08:03.238789500 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2019-07-16 11:29:37.114427380 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2019-07-16 11:31:53.688329287 +0100 @@ -137,14 +137,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -10521,8 +10542,8 @@ /** * Returns a string of signer info, with a newline at the end. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2019-03-12 20:04:51.129807713 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2019-07-16 11:29:37.118427320 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2019-07-16 11:31:53.692329225 +0100 @@ -159,11 +159,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -10656,8 +10677,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2019-07-16 11:31:53.692329225 +0100 @@ -645,7 +645,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -10695,8 +10716,8 @@ super(i, b); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java openjdk-boot/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2019-07-16 11:31:53.692329225 +0100 @@ -45,7 +45,7 @@ // algorithm/mode/padding String[] transTockens = transPattern.split(algorithm); @@ -10725,8 +10746,8 @@ Set<String> elements = decomposeImpl(algorithm); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2019-03-12 20:04:51.129807713 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2019-07-16 11:29:37.118427320 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2019-07-16 11:31:53.692329225 +0100 @@ -61,7 +61,7 @@ try { fis = new FileInputStream(f); @@ -10737,8 +10758,8 @@ String alias; while (list.hasMoreElements()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2019-03-12 20:04:51.025809346 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2019-03-12 20:07:10.279621538 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2019-07-16 11:29:36.294439978 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2019-07-16 11:31:53.692329225 +0100 @@ -229,7 +229,7 @@ */ @@ -10776,8 +10797,8 @@ set.add("buddhist"); set.add("japanese"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/ManifestDigester.java openjdk-boot/jdk/src/share/classes/sun/security/util/ManifestDigester.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/ManifestDigester.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/ManifestDigester.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/ManifestDigester.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/ManifestDigester.java 2019-07-16 11:31:53.692329225 +0100 @@ -203,7 +203,7 @@ // According to the JAR File Specification: "If there are multiple // individual sections for the same file entry, the attributes in @@ -10787,9 +10808,39 @@ boolean oldStyle; private Entry addSection(Section sec) +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java 2019-07-16 12:26:43.029779199 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java 2019-07-16 19:14:44.957598571 +0100 +@@ -49,7 +49,7 @@ + /** + * Common instance for {@code empty()}. + */ +- private static final Optional<?> EMPTY = new Optional<>(); ++ private static final Optional<?> EMPTY = new Optional<Object>(); + + /** + * If non-null, the value; if null, indicates no value is present +@@ -106,7 +106,7 @@ + * @throws NullPointerException if value is {@code null} + */ + public static <T> Optional<T> of(T value) { +- return new Optional<>(value); ++ return new Optional<T>(value); + } + + /** +@@ -193,7 +193,7 @@ + if (!isPresent()) + return empty(); + else { +- return Optional.ofNullable(mapper.apply(value)); ++ return Optional.<U>ofNullable(mapper.apply(value)); + } + } + diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java openjdk-boot/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2019-07-16 11:31:53.692329225 +0100 @@ -96,7 +96,7 @@ private CertificateFactory certificateFactory = null; @@ -10817,9 +10868,30 @@ } // Append the new code signer. If timestamp is invalid, this // jar will be treated as unsigned. +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java openjdk-boot/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java 2019-07-16 11:31:53.700329102 +0100 +@@ -47,7 +47,7 @@ + private static final Date APRIL_16_2019; + + // SHA-256 certificate fingerprints of subCAs with later distrust dates +- private static final Map<String, Date> EXEMPT_SUBCAS = new HashMap<>(); ++ private static final Map<String, Date> EXEMPT_SUBCAS = new HashMap<String, Date>(); + static { + /* + We need to ensure that a date occurs after these dates. +@@ -78,7 +78,7 @@ + } + + // SHA-256 certificate fingerprints of distrusted roots +- private static final Set<String> FINGERPRINTS = new HashSet<>(Arrays.asList( ++ private static final Set<String> FINGERPRINTS = new HashSet<String>(Arrays.asList( + // cacerts alias: geotrustglobalca + // DN: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US + "FF856A2D251DCD88D36656F450126798CFABAADE40799C722DE4D2B5DB36A73A", diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2019-03-12 20:04:51.093808278 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2019-07-16 11:29:36.738433157 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2019-07-16 11:31:53.692329225 +0100 @@ -1278,7 +1278,7 @@ if (exts == null) { return null; @@ -10876,8 +10948,8 @@ public String getFingerprint(String algorithm) { String fingerprint = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2019-07-16 11:31:53.692329225 +0100 @@ -350,7 +350,7 @@ if (extensions == null) { return null; @@ -10906,8 +10978,8 @@ map.put(ext.getId(), ext); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2019-07-16 11:31:53.692329225 +0100 @@ -103,8 +103,8 @@ private X500Principal issuerPrincipal = null; private Date thisUpdate = null; @@ -10938,8 +11010,8 @@ if (!ex.isCritical()) { extSet.add(ex.getExtensionId().toString()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/CommandLine.java openjdk-boot/jdk/src/share/classes/sun/tools/jar/CommandLine.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/CommandLine.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jar/CommandLine.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/CommandLine.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jar/CommandLine.java 2019-07-16 11:31:53.692329225 +0100 @@ -55,7 +55,7 @@ public static String[] parse(String[] args) throws IOException @@ -10950,8 +11022,8 @@ String arg = args[i]; if (arg.length() > 1 && arg.charAt(0) == '@') { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/Manifest.java openjdk-boot/jdk/src/share/classes/sun/tools/jar/Manifest.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/Manifest.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jar/Manifest.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/Manifest.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jar/Manifest.java 2019-07-16 11:31:53.692329225 +0100 @@ -47,10 +47,10 @@ /* list of headers that all pertain to a particular * file in the archive @@ -10966,8 +11038,8 @@ static final String[] hashes = {"SHA"}; static final byte[] EOL = {(byte)'\r', (byte)'\n'}; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/SignatureFile.java openjdk-boot/jdk/src/share/classes/sun/tools/jar/SignatureFile.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/SignatureFile.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jar/SignatureFile.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jar/SignatureFile.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jar/SignatureFile.java 2019-07-16 11:31:53.692329225 +0100 @@ -66,7 +66,7 @@ /* list of headers that all pertain to a particular file in the @@ -10996,8 +11068,8 @@ private MessageDigest getDigest(String algorithm) throws NoSuchAlgorithmException { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2019-07-16 11:31:53.692329225 +0100 @@ -94,7 +94,7 @@ * Run the converter */ @@ -11008,8 +11080,8 @@ boolean createOutputFile = false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2019-07-16 11:31:53.692329225 +0100 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -11124,8 +11196,8 @@ ukeywords.put(key, type); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2019-07-16 11:31:53.692329225 +0100 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -11181,8 +11253,8 @@ extensions.add(locextKey.toString() + SEP + ext.getValue()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2019-07-16 11:31:53.696329163 +0100 @@ -81,7 +81,7 @@ } @@ -11210,8 +11282,8 @@ String key = LocaleUtils.toLowerString(kwd.getKey().value()); String type = LocaleUtils.toLowerString(kwd.getValue()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2019-07-16 11:31:53.696329163 +0100 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -11248,8 +11320,8 @@ return (oldEntry == null) ? null : oldEntry.get(); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2019-07-16 11:31:53.696329163 +0100 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -11269,8 +11341,8 @@ tmpList.add(getLookupLocale(locale)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2019-07-16 11:31:53.696329163 +0100 @@ -187,7 +187,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -11290,8 +11362,8 @@ return log; } diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2019-07-16 11:31:53.696329163 +0100 @@ -160,7 +160,7 @@ } @@ -11326,8 +11398,8 @@ openwrite.add(WRITE); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2019-07-16 11:31:53.696329163 +0100 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -11340,8 +11412,8 @@ private CharsetDecoder decoder() { CharsetDecoder dec = decTL.get(); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2019-07-16 11:31:53.696329163 +0100 @@ -134,7 +134,7 @@ throws IOException { @@ -11352,8 +11424,8 @@ for (AttrID id : AttrID.values()) { try { diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2019-07-16 11:31:53.696329163 +0100 @@ -157,7 +157,7 @@ @Override @@ -11454,8 +11526,8 @@ inodes.put(root, root); dirs.add(root); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2019-07-16 11:31:53.696329163 +0100 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -11466,8 +11538,8 @@ public ZipFileSystemProvider() {} diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2019-03-12 20:07:10.283621476 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2019-07-16 11:31:53.696329163 +0100 @@ -68,7 +68,7 @@ // We cache the C environment. This means that subsequent calls // to putenv/setenv from C will not be visible from Java code. @@ -11478,8 +11550,8 @@ // so that earlier variables override later ones. for (int i = environ.length-1; i > 0; i-=2) diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2019-03-12 20:04:51.129807713 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2019-07-16 11:29:37.126427197 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2019-07-16 11:31:53.696329163 +0100 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -11544,8 +11616,8 @@ } if (!changeLog.isEmpty()) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-07-16 11:31:53.696329163 +0100 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -11565,8 +11637,8 @@ if (domain != null && domain.length() > 0) { sl.add(domain); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2019-07-16 11:31:53.696329163 +0100 @@ -43,10 +43,10 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController { @@ -11581,8 +11653,8 @@ private static final JarFileFactory instance = new JarFileFactory(); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2019-07-16 11:31:53.696329163 +0100 @@ -133,7 +133,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); @@ -11593,8 +11665,8 @@ void initInterrupt(int fd0, int fd1) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2019-07-16 11:31:53.696329163 +0100 @@ -136,7 +136,7 @@ // eventHigh needed when using file descriptors > 64k @@ -11605,8 +11677,8 @@ void initInterrupt(int fd0, int fd1) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2019-07-16 11:31:53.696329163 +0100 @@ -67,7 +67,7 @@ fd1 = (int) pipeFds; pollWrapper = new EPollArrayWrapper(); @@ -11617,8 +11689,8 @@ protected int doSelect(long timeout) throws IOException { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2019-07-16 11:31:53.696329163 +0100 @@ -113,7 +113,7 @@ SocketAddress[] saa) { @@ -11629,8 +11701,8 @@ set.add(getRevealedLocalAddress(sa, sm)); } diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2019-07-16 11:31:53.696329163 +0100 @@ -153,12 +153,12 @@ static { @@ -11649,8 +11721,8 @@ if (!(isEncodingSupported("US-ASCII") && isEncodingSupported("ISO-8859-1"))) diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2019-07-16 11:31:53.696329163 +0100 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -11670,8 +11742,8 @@ long fp = setmntent(fstab.getBytes(), "r".getBytes()); try { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2019-07-16 11:31:53.696329163 +0100 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -11682,8 +11754,8 @@ int pos = 0; while (pos < size) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2019-07-16 11:31:53.696329163 +0100 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -11694,8 +11766,8 @@ long offset = address + i*SIZEOF_ACE_T; diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2019-07-16 11:31:53.696329163 +0100 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -11715,8 +11787,8 @@ UnixPath mnttab = new UnixPath(this, "/etc/mnttab"); long fp = fopen(mnttab, "r"); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2019-07-16 11:31:53.696329163 +0100 @@ -83,7 +83,7 @@ } @@ -11727,8 +11799,8 @@ byte[] name; while ((name = readdir(dp)) != null) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2019-07-16 11:31:53.696329163 +0100 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -11739,8 +11811,8 @@ if ((bits & UnixConstants.S_IRUSR) > 0) perms.add(PosixFilePermission.OWNER_READ); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java ---- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2019-07-16 11:31:53.696329163 +0100 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -11762,8 +11834,8 @@ StringBuilder sb = new StringBuilder(size()*30); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2019-07-16 11:31:53.696329163 +0100 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -11774,8 +11846,8 @@ // comma and space are valid delimites StringTokenizer st = new StringTokenizer(str, ", "); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2019-07-16 11:31:53.696329163 +0100 @@ -128,7 +128,7 @@ } @@ -11786,8 +11858,8 @@ for (int i = 0; i <= 25; i++) { // 0->A, 1->B, 2->C... if ((drives & (1 << i)) != 0) { diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2019-07-16 11:31:53.700329102 +0100 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -11798,8 +11870,8 @@ // empty path considered to have one name element list.add(0); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2019-07-16 11:31:53.700329102 +0100 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -11810,8 +11882,8 @@ // decode each of the ACEs to AclEntry objects for (int i=0; i<aceCount; i++) { diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2019-07-16 11:31:53.700329102 +0100 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -11858,8 +11930,8 @@ opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); opts.add(CREATE); diff -Nru openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java ---- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2019-07-16 11:31:53.700329102 +0100 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -11870,8 +11942,8 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(baos); diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java ---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2019-07-16 11:31:53.700329102 +0100 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -11882,8 +11954,8 @@ private int pos; private int newPos; diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java ---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2019-07-16 11:31:53.700329102 +0100 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -11894,8 +11966,8 @@ public int stackSize(int currentSize) { return currentSize + 1; diff -Nru openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java ---- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2019-07-16 11:31:53.700329102 +0100 @@ -103,7 +103,7 @@ } } @@ -11906,8 +11978,8 @@ private static void check(Type t, String what) { if (t == null || !checking.add(t)) diff -Nru openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java ---- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2019-07-16 11:31:53.700329102 +0100 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -11918,8 +11990,8 @@ Thread appThread = new Thread(appsThreadGroup, launcher, "AppThread-0"); diff -Nru openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java ---- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2019-02-25 01:45:18.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2019-03-12 20:07:10.287621412 +0000 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2019-07-16 08:34:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2019-07-16 11:31:53.700329102 +0100 @@ -60,7 +60,7 @@ } } @@ -11929,36 +12001,3 @@ List<Thread> threads = new ArrayList<Thread>(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/SequencedEvent.java openjdk-boot/jdk/src/share/classes/java/awt/SequencedEvent.java ---- openjdk-boot.orig/jdk/src/share/classes/java/awt/SequencedEvent.java 2019-04-30 00:44:04.986086797 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/awt/SequencedEvent.java 2019-04-30 00:44:29.373711232 +0100 -@@ -55,7 +55,7 @@ - private final AWTEvent nested; - private AppContext appContext; - private boolean disposed; -- private final LinkedList<AWTEvent> pendingEvents = new LinkedList<>(); -+ private final LinkedList<AWTEvent> pendingEvents = new LinkedList<AWTEvent>(); - - static { - AWTAccessor.setSequencedEventAccessor(new AWTAccessor.SequencedEventAccessor() { -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java openjdk-boot/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java 2019-04-30 00:44:04.994086673 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java 2019-04-30 00:45:02.705197935 +0100 -@@ -47,7 +47,7 @@ - private static final Date APRIL_16_2019; - - // SHA-256 certificate fingerprints of subCAs with later distrust dates -- private static final Map<String, Date> EXEMPT_SUBCAS = new HashMap<>(); -+ private static final Map<String, Date> EXEMPT_SUBCAS = new HashMap<String, Date>(); - static { - /* - We need to ensure that a date occurs after these dates. -@@ -78,7 +78,7 @@ - } - - // SHA-256 certificate fingerprints of distrusted roots -- private static final Set<String> FINGERPRINTS = new HashSet<>(Arrays.asList( -+ private static final Set<String> FINGERPRINTS = new HashSet<String>(Arrays.asList( - // cacerts alias: geotrustglobalca - // DN: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US - "FF856A2D251DCD88D36656F450126798CFABAADE40799C722DE4D2B5DB36A73A",
--- a/patches/boot/ecj-multicatch.patch Fri May 10 18:09:36 2019 +0100 +++ b/patches/boot/ecj-multicatch.patch Wed Jul 17 16:53:58 2019 +0100 @@ -1749,3 +1749,16 @@ if (DEBUG_CP_URL_CHECK) { System.err.println("Class-Path entry: \"" + path + "\" ignored in JAR file " + base); } +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/ECUtil.java 2019-07-17 04:17:56.933985576 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/ECUtil.java 2019-07-17 04:18:30.989463337 +0100 +@@ -92,7 +92,9 @@ + private static KeyFactory getKeyFactory() { + try { + return KeyFactory.getInstance("EC", "SunEC"); +- } catch (NoSuchAlgorithmException | NoSuchProviderException e) { ++ } catch (NoSuchAlgorithmException e) { ++ throw new RuntimeException(e); ++ } catch (NoSuchProviderException e) { + throw new RuntimeException(e); + } + }
--- a/patches/boot/ecj-stringswitch.patch Fri May 10 18:09:36 2019 +0100 +++ b/patches/boot/ecj-stringswitch.patch Wed Jul 17 16:53:58 2019 +0100 @@ -1800,3 +1800,61 @@ "No MAC implementation for " + algo); } return kdf; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Preconditions.java openjdk-boot/jdk/src/share/classes/sun/security/util/Preconditions.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Preconditions.java 2019-07-17 04:20:04.496029417 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/Preconditions.java 2019-07-17 04:54:34.212283390 +0100 +@@ -169,31 +169,30 @@ + } + + int argSize = 0; +- switch (checkKind) { +- case "checkIndex": +- argSize = 2; +- break; +- case "checkFromToIndex": +- case "checkFromIndexSize": +- argSize = 3; +- break; +- default: +- } +- ++ if ("checkIndex".equals(checkKind)) { ++ argSize = 2; ++ } else if ("checkFromToIndex".equals(checkKind) || ++ "checkFromIndexSize".equals(checkKind)) { ++ argSize = 3; ++ } ++ + // Switch to default if fewer or more arguments than required are supplied +- switch ((args.size() != argSize) ? "" : checkKind) { +- case "checkIndex": +- return String.format("Index %d out-of-bounds for length %d", +- args.get(0), args.get(1)); +- case "checkFromToIndex": +- return String.format("Range [%d, %d) out-of-bounds for length %d", +- args.get(0), args.get(1), args.get(2)); +- case "checkFromIndexSize": +- return String.format("Range [%d, %<d + %d) out-of-bounds for length %d", +- args.get(0), args.get(1), args.get(2)); +- default: +- return String.format("Range check failed: %s %s", checkKind, args); +- } ++ if (args.size() != argSize) { ++ return String.format("Range check failed: %s %s", checkKind, args); ++ } ++ ++ if ("checkIndex".equals(checkKind)) { ++ return String.format("Index %d out-of-bounds for length %d", ++ args.get(0), args.get(1)); ++ } else if ("checkFromToIndex".equals(checkKind)) { ++ return String.format("Range [%d, %d) out-of-bounds for length %d", ++ args.get(0), args.get(1), args.get(2)); ++ } else if ("checkFromIndexSize".equals(checkKind)) { ++ return String.format("Range [%d, %<d + %d) out-of-bounds for length %d", ++ args.get(0), args.get(1), args.get(2)); ++ } else { ++ return String.format("Range check failed: %s %s", checkKind, args); ++ } + } + + /**
--- a/patches/pr2124.patch Fri May 10 18:09:36 2019 +0100 +++ b/patches/pr2124.patch Wed Jul 17 16:53:58 2019 +0100 @@ -1,10 +1,11 @@ -diff -r 9665966de2e7 src/share/classes/sun/security/ec/NamedCurve.java ---- openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:53:29 2014 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:58:18 2014 +0000 -@@ -162,114 +162,6 @@ +diff --git openjdk.orig/jdk/src/share/classes/sun/security/ec/CurveDB.java openjdk/jdk/src/share/classes/sun/security/ec/CurveDB.java +--- openjdk.orig/jdk/src/share/classes/sun/security/ec/CurveDB.java ++++ openjdk/jdk/src/share/classes/sun/security/ec/CurveDB.java +@@ -167,115 +167,6 @@ + static { + Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN); - static { - /* SEC2 prime curves */ +- /* SEC2 prime curves */ - add("secp112r1", "1.3.132.0.6", P, - "DB7C2ABF62E35E668076BEAD208B", - "DB7C2ABF62E35E668076BEAD2088", @@ -12,7 +13,7 @@ - "09487239995A5EE76B55F9C2F098", - "A89CE5AF8724C0A23E0E0FF77500", - "DB7C2ABF62E35E7628DFAC6561C5", -- 1); +- 1, nameSplitPattern); - - add("secp112r2", "1.3.132.0.7", P, - "DB7C2ABF62E35E668076BEAD208B", @@ -21,7 +22,7 @@ - "4BA30AB5E892B4E1649DD0928643", - "adcd46f5882e3747def36e956e97", - "36DF0AAFD8B8D7597CA10520D04B", -- 4); +- 4, nameSplitPattern); - - add("secp128r1", "1.3.132.0.28", P, - "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", @@ -30,7 +31,7 @@ - "161FF7528B899B2D0C28607CA52C5B86", - "CF5AC8395BAFEB13C02DA292DDED7A83", - "FFFFFFFE0000000075A30D1B9038A115", -- 1); +- 1, nameSplitPattern); - - add("secp128r2", "1.3.132.0.29", P, - "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF", @@ -39,7 +40,7 @@ - "7B6AA5D85E572983E6FB32A7CDEBC140", - "27B6916A894D3AEE7106FE805FC34B44", - "3FFFFFFF7FFFFFFFBE0024720613B5A3", -- 4); +- 4, nameSplitPattern); - - add("secp160k1", "1.3.132.0.9", P, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", @@ -48,7 +49,7 @@ - "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB", - "938CF935318FDCED6BC28286531733C3F03C4FEE", - "0100000000000000000001B8FA16DFAB9ACA16B6B3", -- 1); +- 1, nameSplitPattern); - - add("secp160r1", "1.3.132.0.8", P, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF", @@ -57,7 +58,7 @@ - "4A96B5688EF573284664698968C38BB913CBFC82", - "23A628553168947D59DCC912042351377AC5FB32", - "0100000000000000000001F4C8F927AED3CA752257", -- 1); +- 1, nameSplitPattern); - - add("secp160r2", "1.3.132.0.30", P, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73", @@ -66,7 +67,7 @@ - "52DCB034293A117E1F4FF11B30F7199D3144CE6D", - "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E", - "0100000000000000000000351EE786A818F3A1A16B", -- 1); +- 1, nameSplitPattern); - - add("secp192k1", "1.3.132.0.31", P, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37", @@ -75,7 +76,7 @@ - "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D", - "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D", - "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", -- 1); +- 1, nameSplitPattern); - - add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", @@ -84,7 +85,7 @@ - "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012", - "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811", - "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", -- 1); +- 1, nameSplitPattern); - - add("secp224k1", "1.3.132.0.32", P, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D", @@ -93,7 +94,7 @@ - "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C", - "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5", - "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", -- 1); +- 1, nameSplitPattern); - - add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", @@ -102,7 +103,7 @@ - "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", - "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", -- 1); +- 1, nameSplitPattern); - - add("secp256k1", "1.3.132.0.10", P, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", @@ -111,14 +112,14 @@ - "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798", - "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8", - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", -- 1); +- 1, nameSplitPattern); - add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD, "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF", "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC", -@@ -297,367 +189,6 @@ +@@ -303,367 +194,6 @@ "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", - 1); + 1, nameSplitPattern); - /* ANSI X9.62 prime curves */ - add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P, @@ -128,7 +129,7 @@ - "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A", - "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15", - "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31", -- 1); +- 1, nameSplitPattern); - - add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P, - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", @@ -137,7 +138,7 @@ - "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896", - "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0", - "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13", -- 1); +- 1, nameSplitPattern); - - add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P, - "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", @@ -146,7 +147,7 @@ - "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF", - "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE", - "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B", -- 1); +- 1, nameSplitPattern); - - add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P, - "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", @@ -155,7 +156,7 @@ - "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7", - "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA", - "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063", -- 1); +- 1, nameSplitPattern); - - add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P, - "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF", @@ -164,7 +165,7 @@ - "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A", - "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3", - "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551", -- 1); +- 1, nameSplitPattern); - - /* SEC2 binary curves */ - add("sect113r1", "1.3.132.0.4", B, @@ -174,7 +175,7 @@ - "009D73616F35F4AB1407D73562C10F", - "00A52830277958EE84D1315ED31886", - "0100000000000000D9CCEC8A39E56F", -- 2); +- 2, nameSplitPattern); - - add("sect113r2", "1.3.132.0.5", B, - "020000000000000000000000000201", @@ -183,7 +184,7 @@ - "01A57A6A7B26CA5EF52FCDB8164797", - "00B3ADC94ED1FE674C06E695BABA1D", - "010000000000000108789B2496AF93", -- 2); +- 2, nameSplitPattern); - - add("sect131r1", "1.3.132.0.22", B, - "080000000000000000000000000000010D", @@ -192,7 +193,7 @@ - "0081BAF91FDF9833C40F9C181343638399", - "078C6E7EA38C001F73C8134B1B4EF9E150", - "0400000000000000023123953A9464B54D", -- 2); +- 2, nameSplitPattern); - - add("sect131r2", "1.3.132.0.23", B, - "080000000000000000000000000000010D", @@ -201,7 +202,7 @@ - "0356DCD8F2F95031AD652D23951BB366A8", - "0648F06D867940A5366D9E265DE9EB240F", - "0400000000000000016954A233049BA98F", -- 2); +- 2, nameSplitPattern); - - add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD, - "0800000000000000000000000000000000000000C9", @@ -210,7 +211,7 @@ - "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8", - "0289070FB05D38FF58321F2E800536D538CCDAA3D9", - "04000000000000000000020108A2E0CC0D99F8A5EF", -- 2); +- 2, nameSplitPattern); - - add("sect163r1", "1.3.132.0.2", B, - "0800000000000000000000000000000000000000C9", @@ -219,7 +220,7 @@ - "0369979697AB43897789566789567F787A7876A654", - "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883", - "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", -- 2); +- 2, nameSplitPattern); - - add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD, - "0800000000000000000000000000000000000000C9", @@ -228,7 +229,7 @@ - "03F0EBA16286A2D57EA0991168D4994637E8343E36", - "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1", - "040000000000000000000292FE77E70C12A4234C33", -- 2); +- 2, nameSplitPattern); - - add("sect193r1", "1.3.132.0.24", B, - "02000000000000000000000000000000000000000000008001", @@ -237,7 +238,7 @@ - "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1", - "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05", - "01000000000000000000000000C7F34A778F443ACC920EBA49", -- 2); +- 2, nameSplitPattern); - - add("sect193r2", "1.3.132.0.25", B, - "02000000000000000000000000000000000000000000008001", @@ -246,7 +247,7 @@ - "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F", - "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C", - "010000000000000000000000015AAB561B005413CCD4EE99D5", -- 2); +- 2, nameSplitPattern); - - add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD, - "020000000000000000000000000000000000000004000000000000000001", @@ -255,7 +256,7 @@ - "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126", - "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3", - "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", -- 4); +- 4, nameSplitPattern); - - add("sect233r1 [NIST B-233]", "1.3.132.0.27", B, - "020000000000000000000000000000000000000004000000000000000001", @@ -264,7 +265,7 @@ - "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B", - "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052", - "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", -- 2); +- 2, nameSplitPattern); - - add("sect239k1", "1.3.132.0.3", B, - "800000000000000000004000000000000000000000000000000000000001", @@ -273,7 +274,7 @@ - "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC", - "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA", - "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", -- 4); +- 4, nameSplitPattern); - - add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD, - "0800000000000000000000000000000000000000000000000000000000000000000010A1", @@ -282,7 +283,7 @@ - "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836", - "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259", - "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61", -- 4); +- 4, nameSplitPattern); - - add("sect283r1 [NIST B-283]", "1.3.132.0.17", B, - "0800000000000000000000000000000000000000000000000000000000000000000010A1", @@ -291,7 +292,7 @@ - "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053", - "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4", - "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307", -- 2); +- 2, nameSplitPattern); - - add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD, - "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", @@ -300,7 +301,7 @@ - "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746", - "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B", - "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", -- 4); +- 4, nameSplitPattern); - - add("sect409r1 [NIST B-409]", "1.3.132.0.37", B, - "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", @@ -309,7 +310,7 @@ - "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7", - "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706", - "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173", -- 2); +- 2, nameSplitPattern); - - add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD, - "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", @@ -318,7 +319,7 @@ - "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972", - "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3", - "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001", -- 4); +- 4, nameSplitPattern); - - add("sect571r1 [NIST B-571]", "1.3.132.0.39", B, - "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", @@ -327,7 +328,7 @@ - "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19", - "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B", - "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47", -- 2); +- 2, nameSplitPattern); - - /* ANSI X9.62 binary curves */ - add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B, @@ -337,7 +338,7 @@ - "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D", - "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB", - "40000000000000000000000004A20E90C39067C893BBB9A5", -- 2); +- 2, nameSplitPattern); - - add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B, - "800000000000000000000000000000000000000000000201", @@ -346,7 +347,7 @@ - "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10", - "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A", - "20000000000000000000000050508CB89F652824E06B8173", -- 4); +- 4, nameSplitPattern); - - add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B, - "800000000000000000000000000000000000000000000201", @@ -355,7 +356,7 @@ - "375D4CE24FDE434489DE8746E71786015009E66E38A926DD", - "545A39176196575D985999366E6AD34CE0A77CD7127B06BE", - "155555555555555555555555610C0B196812BFB6288A3EA3", -- 6); +- 6, nameSplitPattern); - - add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B, - "800000000000000000000000000000000000000000000000001000000001", @@ -364,7 +365,7 @@ - "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D", - "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305", - "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", -- 4); +- 4, nameSplitPattern); - - add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B, - "800000000000000000000000000000000000000000000000001000000001", @@ -373,7 +374,7 @@ - "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205", - "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833", - "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", -- 6); +- 6, nameSplitPattern); - - add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B, - "800000000000000000000000000000000000000000000000001000000001", @@ -382,7 +383,7 @@ - "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92", - "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461", - "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", -- 0xA); +- 0xA, nameSplitPattern); - - add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B, - "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001", @@ -391,7 +392,7 @@ - "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097", - "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD", - "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B", -- 0x4C); +- 0x4C, nameSplitPattern); - - add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B, - "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001", @@ -400,7 +401,7 @@ - "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7", - "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760", - "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91", -- 0x2760); +- 0x2760, nameSplitPattern); - - /* ANSI X9.62 binary curves from the 1998 standard but forbidden - * in the 2005 version of the standard. @@ -415,7 +416,7 @@ - "07AF69989546103D79329FCC3D74880F33BBE803CB", - "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F", - "0400000000000000000001E60FC8821CC74DAEAFC1", -- 2); +- 2, nameSplitPattern); - - add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B, - "080000000000000000000000000000000000000107", @@ -424,7 +425,7 @@ - "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5", - "079F684DDF6684C5CD258B3890021B2386DFD19FC5", - "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", -- 2); +- 2, nameSplitPattern); - - add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B, - "080000000000000000000000000000000000000107", @@ -433,7 +434,7 @@ - "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB", - "05B935590C155E17EA48EB3FF3718B893DF59A05D0", - "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", -- 2); +- 2, nameSplitPattern); - - add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B, - "0100000000000000000000000000000000080000000007", @@ -442,7 +443,7 @@ - "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798", - "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C", - "00010092537397ECA4F6145799D62B0A19CE06FE26AD", -- 0xFF6E); +- 0xFF6E, nameSplitPattern); - - add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B, - "010000000000000000000000000000000800000000000000000007", @@ -451,7 +452,7 @@ - "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A", - "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3", - "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", -- 0xFE48); +- 0xFE48, nameSplitPattern); - - add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B, - "010000000000000000000000000000000000000000000000000000010000000000000B", @@ -460,7 +461,7 @@ - "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D", - "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23", - "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521", -- 0xFF06); +- 0xFF06, nameSplitPattern); - - add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B, - "010000000000000000000000000000000000000000000000000000000000000000000000000807", @@ -469,7 +470,7 @@ - "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614", - "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B", - "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D", -- 0xFE2E); +- 0xFE2E, nameSplitPattern); - - add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B, - "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007", @@ -478,16 +479,16 @@ - "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F", - "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310", - "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967", -- 0xFF70); +- 0xFF70, nameSplitPattern); -*/ - - SPLIT_PATTERN = null; + specCollection = Collections.unmodifiableCollection(oidMap.values()); } - -diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java + } +diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java +--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java +++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java -@@ -62,29 +62,6 @@ +@@ -65,29 +65,6 @@ // See sun.security.util.CurveDB for the OIDs private static enum NamedEllipticCurve { @@ -517,10 +518,10 @@ P256_R1(23, "secp256r1", "1.2.840.10045.3.1.7", true), // NIST P-256 P384_R1(24, "secp384r1", "1.3.132.0.34", true), // NIST P-384 P521_R1(25, "secp521r1", "1.3.132.0.35", true); // NIST P-521 -diff --git a/test/sun/security/ec/TestEC.java b/test/sun/security/ec/TestEC.java ---- openjdk/jdk/test/sun/security/ec/TestEC.java +diff --git openjdk.orig/jdk/test/sun/security/ec/TestEC.java openjdk/jdk/test/sun/security/ec/TestEC.java +--- openjdk.orig/jdk/test/sun/security/ec/TestEC.java +++ openjdk/jdk/test/sun/security/ec/TestEC.java -@@ -35,7 +35,7 @@ +@@ -30,7 +30,7 @@ * @library ../pkcs11/sslecc * @library ../../../java/security/testlibrary * @compile -XDignore.symbol.file TestEC.java @@ -529,8 +530,8 @@ */ import java.security.NoSuchProviderException; -diff --git a/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java b/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java ---- openjdk/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java +diff --git openjdk.orig/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java openjdk/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java +--- openjdk.orig/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java +++ openjdk/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java @@ -26,7 +26,7 @@ * @bug 4496785