Mercurial > hg > release > icedtea7-2.6
changeset 2911:5539b04c69ae
Bump to icedtea-2.6.8.
Upstream changes:
- Bump to icedtea-2.6.8
- S6624200: Regression test fails: test/closed/javax/swing/JMenuItem/4654927/bug4654927.java
- S6882559: new JEditorPane("text/plain","") fails for null context class loader
- S7090158: Networking Libraries don't build with javac -Werror
- S7125055: ContentHandler.getContent API changed in error
- S7145960: sun/security/mscapi/ShortRSAKey1024.sh failing on windows
- S7172012: Make test-in-build an option (Queens)
- S7187051: ShortRSAKeynnn.sh tests should do cleanup before start test
- S8000626: Implement dead key detection for KeyEvent on Linux
- S8000897: VM crash in CompileBroker
- S8003890: corelibs test scripts should pass TESTVMOPTS
- S8005629: javac warnings compiling java.awt.EventDispatchThread and sun.awt.X11.XIconWindow
- S8010297: Missing isLoggable() checks in logging code
- S8010782: clean up source files containing carriage return characters
- S8014431: cleanup warnings indicated by the -Wunused-value compiler option on linux
- S8015265: revise the fix for 8007037
- S8016491: PPC64 (part 2): Clean up PPC defines.
- S8016586: PPC64 (part 3): basic changes for PPC64
- S8016696: PPC64 (part 4): add relocation for trampoline stubs
- S8016747: Replace deprecated PlatformLogger isLoggable(int) with isLoggable(Level)
- S8017313: PPC64 (part 6): stack handling improvements
- S8017317: PPC64 (part 7): cppInterpreter: implement support for biased locking
- S8019517: PPC64 (part 102): cppInterpreter: implement G1 support
- S8019518: PPC64 (part 103): cppInterpreter: implement support for compressed Oops
- S8019519: PPC64 (part 105): C interpreter: implement support for jvmti early return.
- S8019929: PPC64 (part 107): Extend ELF-decoder to support PPC64 function descriptor tables
- S8019973: PPC64 (part 11): Fix IA64 preprocessor conditionals on AIX.
- S8020121: PPC64: fix build in cppInterpreter after 8019519
- S8020190: Fatal: Bug in native code: jfieldID must match object
- S8020708: NLS mnemonics missing in SwingSet2/JInternalFrame demo
- S8024344: PPC64 (part 112): C argument in register AND stack slot.
- S8024468: PPC64 (part 201): cppInterpreter: implement bytecode profiling
- S8024469: PPC64 (part 202): cppInterpreter: support for OSR.
- S8024756: method grouping tabs are not selectable
- S8024854: PPC64: Basic changes and files to build the class library on AIX
- S8024900: PPC64: Enable new build on AIX (jdk part)
- S8026741: jdk8 l10n resource file translation update 5
- S8029957: PPC64 (part 213): cppInterpreter: memory ordering for object initialization
- S8033168: PPC64: gcc 4.8 warning in output_c.cpp
- S8034797: AIX: Fix os::naked_short_sleep() in os_aix.cpp after 8028280
- S8035396: Introduce accessor for tmp_oop in frame.
- S8035647: PPC64: Support for elf v2 abi.
- S8036767: PPC64: Support for little endian execution model
- S8036976: PPC64: implement the template interpreter
- S8037915: PPC64/AIX: Several smaller fixes
- S8042309: Some bugfixes for the ppc64 port
- S8048147: Privilege tests with JAAS Subject.doAs
- S8048357: PKCS basic tests
- S8049171: Additional tests for jarsigner's warnings
- S8050942: PPC64: implement template interpreter for ppc64le
- S8050972: Concurrency problem in PcDesc cache
- S8056122: Upgrade JDK to use LittleCMS 2.6
- S8057934: Upgrade to LittleCMS 2.6 breaks AIX build
- S8059177: jdk8u40 l10n resource file translation update 1
- S8067364: Printing to Postscript doesn't support dieresis
- S8069590: AIX port of "8050807: Better performing performance data handling"
- S8075584: test for 8067364 depends on hardwired text advance
- S8076486: [TESTBUG] javax/security/auth/Subject/doAs/NestedActions.java fails if extra VM options are given
- S8077953: [TEST_BUG] com/sun/management/OperatingSystemMXBean/TestTotalSwap.java Compilation failed after JDK-8077387
- S8078482: ppc: pass thread to throw_AbstractMethodError
- S8080190: PPC64: Fix wrong rotate instructions in the .ad file
- S8080628: No mnemonics on Open and Save buttons in JFileChooser
- S8083601: jdk8u60 l10n resource file translation update 2
- S8139258: PPC64LE: argument passing problem when passing 15 floats in native call
- S8139421: PPC64LE: MacroAssembler::bxx64_patchable kill register R12
- S8140530: Creating a VolatileImage with size 0,0 results in no longer working g2d.drawString
- S8142926: OutputAnalyzer's shouldXXX() calls return this
- S8143134: L10n resource file translation update
- S8147077: IllegalArgumentException thrown by api/java_awt/Component/FlipBufferStrategy/indexTGF_General
- S8148127: IllegalArgumentException thrown by JCK test api/java_awt/Component/FlipBufferStrategy/indexTGF_General in opengl pipeline
- S8148487: PPC64: Better byte behavior
- S8150611: Security problem on sun.misc.resources.Messages*
- S8151921: Improved page resolution
- S8155968: Update command line options
- S8155973: Tighten jar checks
- S8157176: Improved classfile parsing
- S8157653: [Parfait] Uninitialised variable in awt_Font.cpp
- S8157739: Classloader Consistency Checking
- S8157749: Improve handling of DNS error replies
- S8157753: Audio replay enhancement
- S8157759: LCMS Transform Sampling Enhancement
- S8157764: Better handling of interpolation plugins
- S8158260: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
- S8158302: Handle contextual glyph substitutions
- S8158734: JEditorPane.createEditorKitForContentType throws NPE after 6882559
- S8158993: Service Menu services
- S8159495: Fix index offsets
- S8159503: Amend Annotation Actions
- S8159511: Stack map validation
- S8159515: Improve indy validation
- S8159519: Reformat JDWP messages
- S8159684: (tz) Support tzdata2016f
- S8160090: Better signature handling in pack200
- S8160094: Improve pack200 layout
- S8160098: Clean up color profiles
- S8160591: Improve internal array handling
- S8160838: Better HTTP service
- S8160934: isnan() is not available on older MSVC compilers
- S8161262: Fix jdk build with gcc 4.1.2: -fno-strict-overflow not known.
- S8162411: Service Menu services 2
- S8162419: closed/com/oracle/jfr/runtime/TestVMInfoEvent.sh failing after JDK-8155968
- S8162511: 8u111 L10n resource file updates
- S8162792: Remove constraint DSA keySize < 1024 from jdk.jar.disabledAlgorithms in jdk8
- S8164452: 8u111 L10n resource file update - msgdrop 20
- S8165807: PPC64: Backport PPC64 port to OpenJDK 7
- S8165816: jarsigner -verify shows jar unsigned if it was signed with a weak algorithm
- S8166381: Back out changes to the java.security file to not disable MD5
- S8167144: Fix aix after 8022507: SIGSEGV at ParMarkBitMap::verify_clear()
- S8167198: Changes to make AIX compile after the merge
- S8167335: Fix build on Linux with 64kb default page size
- S8168888: Port 8160591: Improve internal array handling to AArch64.
ChangeLog:
2016-11-11 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 121.
(BUILD_VERSION): Reset to b00.
(CORBA_CHANGESET): Update to icedtea-2.6.8.
(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.
* configure.ac: Bump to 2.6.8.
* hotspot.map.in: Update to icedtea-2.6.8.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new cases in
java.net.URLConnection, java.net.URL,
sun.net.TransferProtocolClient,
sun.net.www.protocol.http.AuthenticationHeader
and sun.net.www.protocol.http.HttpURLConnection.
* patches/boot/ecj-multicatch.patch:
Add new cases in
sun.net.www.protocol.http.HttpURLConnection,
com.sun.net.httpserver.spi.HttpServerProvider and
sun.net.ftp.FtpClientProvider.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Sat, 12 Nov 2016 22:37:54 +0000 |
| parents | 3b8a51ebc272 |
| children | be5bb5b9519d |
| files | ChangeLog Makefile.am NEWS configure.ac hotspot.map.in patches/boot/ecj-diamond.patch patches/boot/ecj-multicatch.patch |
| diffstat | 7 files changed, 996 insertions(+), 752 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 11 06:15:15 2016 +0000 +++ b/ChangeLog Sat Nov 12 22:37:54 2016 +0000 @@ -1,3 +1,36 @@ +2016-11-11 Andrew John Hughes <gnu.andrew@member.fsf.org> + + Bump to icedtea-2.6.8. + * Makefile.am: + (JDK_UPDATE_VERSION): Bump to 121. + (BUILD_VERSION): Reset to b00. + (CORBA_CHANGESET): Update to icedtea-2.6.8. + (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. + * configure.ac: Bump to 2.6.8. + * hotspot.map.in: Update to icedtea-2.6.8. + * patches/boot/ecj-diamond.patch: + Regenerated. Add new cases in + java.net.URLConnection, java.net.URL, + sun.net.TransferProtocolClient, + sun.net.www.protocol.http.AuthenticationHeader + and sun.net.www.protocol.http.HttpURLConnection. + * patches/boot/ecj-multicatch.patch: + Add new cases in + sun.net.www.protocol.http.HttpURLConnection, + com.sun.net.httpserver.spi.HttpServerProvider and + sun.net.ftp.FtpClientProvider. + 2016-11-08 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3212: Disable ARM32 JIT by default
--- a/Makefile.am Fri Nov 11 06:15:15 2016 +0000 +++ b/Makefile.am Sat Nov 12 22:37:54 2016 +0000 @@ -1,22 +1,22 @@ # Dependencies -JDK_UPDATE_VERSION = 111 -BUILD_VERSION = b01 +JDK_UPDATE_VERSION = 121 +BUILD_VERSION = b00 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 8bceffc6f67e -JAXP_CHANGESET = dfe9f8c968df -JAXWS_CHANGESET = 6ae901b45031 -JDK_CHANGESET = 0819886b3679 -LANGTOOLS_CHANGESET = 2e6c46aea99f -OPENJDK_CHANGESET = a1ef40f591be - -CORBA_SHA256SUM = 2fba0616b7d0e3bb92444716cc0dc2d825804229a5ca7a8691273d033982edd9 -JAXP_SHA256SUM = 7c1b733af9d3c547b64ee68e08b4376157c63a36d52ca9f4f4172eaec91777e7 -JAXWS_SHA256SUM = 20595307adc6042cb7e2daeca20455eb5d11286a9a1b86cd4ad332c0dabe6fc9 -JDK_SHA256SUM = a143425c38a6425aa30f2d3692d134d12d94e1f02383f6db085e012c6d364679 -LANGTOOLS_SHA256SUM = ff5db42f78da9126c15ccc00a47f3a58f138a30cb53e7005e370cf6437ad6a32 -OPENJDK_SHA256SUM = 3d6da494b0183521fa291d6d81ba8b202b66b58ce5980c39312c2272ad0f8b18 +CORBA_CHANGESET = 9e002eaf26ed +JAXP_CHANGESET = 3369fa5a875b +JAXWS_CHANGESET = 26bcf28b3a60 +JDK_CHANGESET = 52225839bbea +LANGTOOLS_CHANGESET = 545e512eb4de +OPENJDK_CHANGESET = 653c2662034d + +CORBA_SHA256SUM = 2f728daac0ca88e7097a223f8c1ceaff8b4597e4622c5e365931edb25aa04538 +JAXP_SHA256SUM = ba1ba48e9ad9ee36df344e6e283f0f7a9f8aa9cee223c8ea2f2ee711092091fc +JAXWS_SHA256SUM = 753093e71ac609b9350bf16daf230fdc2f873cd573428883448098e39e4c041a +JDK_SHA256SUM = ec1118f52eb208a529e99ec1a64351b737bc0f892e05f0ffd4327b4be533e761 +LANGTOOLS_SHA256SUM = 004ec63ebdd0b6182c2bde3e190bb745a0d932ad7b05901a4376a04f06158813 +OPENJDK_SHA256SUM = e6bea22acb9e89e200fdc2a4a7a04ecee042f3ea9f9a49bab739fdd2598e4ce3 DROP_URL = http://icedtea.classpath.org/download/drops
--- a/NEWS Fri Nov 11 06:15:15 2016 +0000 +++ b/NEWS Sat Nov 12 22:37:54 2016 +0000 @@ -15,7 +15,72 @@ New in release 2.6.8 (2016-10-XX): * Security fixes + - S8151921: Improved page resolution + - S8155968: Update command line options + - S8155973, CVE-2016-5542: Tighten jar checks + - S8157176: Improved classfile parsing + - S8157739, CVE-2016-5554: Classloader Consistency Checking + - S8157749: Improve handling of DNS error replies + - S8157753: Audio replay enhancement + - S8157759: LCMS Transform Sampling Enhancement + - S8157764: Better handling of interpolation plugins + - S8158302: Handle contextual glyph substitutions + - S8158993, CVE-2016-5568: Service Menu services + - S8159495: Fix index offsets + - S8159503: Amend Annotation Actions + - S8159511: Stack map validation + - S8159515: Improve indy validation + - S8159519, CVE-2016-5573: Reformat JDWP messages + - S8160090: Better signature handling in pack200 + - S8160094: Improve pack200 layout + - S8160098: Clean up color profiles + - S8160591, CVE-2016-5582: Improve internal array handling + - S8160838, CVE-2016-5597: Better HTTP service - PR3207, RH1367357: lcms2: Out-of-bounds read in Type_MLU_Read() +* Import of OpenJDK 7 u121 build 0 + - S6624200: Regression test fails: test/closed/javax/swing/JMenuItem/4654927/bug4654927.java + - S6882559: new JEditorPane("text/plain","") fails for null context class loader + - S7090158: Networking Libraries don't build with javac -Werror + - S7125055: ContentHandler.getContent API changed in error + - S7145960: sun/security/mscapi/ShortRSAKey1024.sh failing on windows + - S7187051: ShortRSAKeynnn.sh tests should do cleanup before start test + - S8000626: Implement dead key detection for KeyEvent on Linux + - S8003890: corelibs test scripts should pass TESTVMOPTS + - S8005629: javac warnings compiling java.awt.EventDispatchThread and sun.awt.X11.XIconWindow + - S8010297: Missing isLoggable() checks in logging code + - S8010782: clean up source files containing carriage return characters + - S8014431: cleanup warnings indicated by the -Wunused-value compiler option on linux + - S8015265: revise the fix for 8007037 + - S8016747: Replace deprecated PlatformLogger isLoggable(int) with isLoggable(Level) + - S8020708: NLS mnemonics missing in SwingSet2/JInternalFrame demo + - S8024756: method grouping tabs are not selectable + - S8026741: jdk8 l10n resource file translation update 5 + - S8048147: Privilege tests with JAAS Subject.doAs + - S8048357: PKCS basic tests + - S8049171: Additional tests for jarsigner's warnings + - S8059177: jdk8u40 l10n resource file translation update 1 + - S8075584: test for 8067364 depends on hardwired text advance + - S8076486: [TESTBUG] javax/security/auth/Subject/doAs/NestedActions.java fails if extra VM options are given + - S8077953: [TEST_BUG] com/sun/management/OperatingSystemMXBean/TestTotalSwap.java Compilation failed after JDK-8077387 + - S8080628: No mnemonics on Open and Save buttons in JFileChooser + - S8083601: jdk8u60 l10n resource file translation update 2 + - S8140530: Creating a VolatileImage with size 0,0 results in no longer working g2d.drawString + - S8142926: OutputAnalyzer's shouldXXX() calls return this + - S8143134: L10n resource file translation update + - S8147077: IllegalArgumentException thrown by api/java_awt/Component/FlipBufferStrategy/indexTGF_General + - S8148127: IllegalArgumentException thrown by JCK test api/java_awt/Component/FlipBufferStrategy/indexTGF_General in opengl pipeline + - S8150611: Security problem on sun.misc.resources.Messages* + - S8157653: [Parfait] Uninitialised variable in awt_Font.cpp + - S8158734: JEditorPane.createEditorKitForContentType throws NPE after 6882559 + - S8159684: (tz) Support tzdata2016f + - S8160934: isnan() is not available on older MSVC compilers + - S8162411: Service Menu services 2 + - S8162419: closed/com/oracle/jfr/runtime/TestVMInfoEvent.sh failing after JDK-8155968 + - S8162511: 8u111 L10n resource file updates + - S8162792: Remove constraint DSA keySize < 1024 from jdk.jar.disabledAlgorithms in jdk8 + - S8164452: 8u111 L10n resource file update - msgdrop 20 + - S8165816: jarsigner -verify shows jar unsigned if it was signed with a weak algorithm + - S8166381: Back out changes to the java.security file to not disable MD5 * Backports - S6604109, PR3162: javax.print.PrintServiceLookup.lookupPrintServices fails SOMETIMES for Cups - S6907252, PR3162: ZipFileInputStream Not Thread-Safe @@ -63,6 +128,7 @@ - PR3134: JamVM is broken due to 2 new native methods in sun.misc.Unsafe (from S8158260) * AArch64 port - S8167200, PR3204: AArch64: Broken stack pointer adjustment in interpreter + - S8168888: Port 8160591: Improve internal array handling to AArch64. - PR3211: AArch64 build fails with pre-compiled headers disabled New in release 2.6.7 (2016-07-28):
--- a/configure.ac Fri Nov 11 06:15:15 2016 +0000 +++ b/configure.ac Sat Nov 12 22:37:54 2016 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.8pre01], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.6.8], [distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile])
--- a/hotspot.map.in Fri Nov 11 06:15:15 2016 +0000 +++ b/hotspot.map.in Sat Nov 12 22:37:54 2016 +0000 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6b87ff3af68f 039b3c2faec71ed6f0f92398a5bb7a0edc5507a7af3c88c80fad8d678781690a +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 223f6c442d49 ca55f548f3169ba9bb6ca81265900722150953ee19b19606e4bf8e6dd50d7194
--- a/patches/boot/ecj-diamond.patch Fri Nov 11 06:15:15 2016 +0000 +++ b/patches/boot/ecj-diamond.patch Sat Nov 12 22:37:54 2016 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-07-28 16:22:54.325235496 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-10-28 08:01:29.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-11-11 07:02:18.764911241 +0000 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-07-28 16:22:54.325235496 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-10-28 08:01:29.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-11-11 07:02:18.764911241 +0000 @@ -50,7 +50,7 @@ */ private class HookPutFields extends ObjectOutputStream.PutField @@ -23,8 +23,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/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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-07-28 16:22:54.325235496 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-10-28 08:01:29.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-11-11 07:02:18.764911241 +0000 @@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set<ObjectAdapterFactory> oaset; @@ -35,8 +35,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-07-28 16:22:54.325235496 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-10-28 08:01:29.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-11-11 07:02:18.768911176 +0000 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -56,8 +56,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-07-28 16:22:54.325235496 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-11-11 07:02:18.768911176 +0000 @@ -192,7 +192,7 @@ NodeSet dist = new NodeSet(); dist.setShouldCacheNodes(true); @@ -68,8 +68,8 @@ for (int i = 0; i < nl.getLength(); i++) { 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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-07-28 16:22:54.325235496 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-11-11 07:02:18.768911176 +0000 @@ -220,7 +220,7 @@ public Map<String, Object> getEnvironmentHash() { @@ -188,8 +188,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-07-28 16:22:54.325235496 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-11-11 07:02:18.768911176 +0000 @@ -51,7 +51,7 @@ /** * Legal conversions between internal types. @@ -200,8 +200,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-11-11 07:02:18.768911176 +0000 @@ -139,7 +139,7 @@ private boolean _isStatic = false; @@ -225,8 +225,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-11-11 07:02:18.768911176 +0000 @@ -107,7 +107,7 @@ // Check if we have any declared namespaces @@ -273,8 +273,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-11-11 07:02:18.768911176 +0000 @@ -129,22 +129,22 @@ /** * A mapping between templates and test sequences. @@ -327,8 +327,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-11-11 07:02:18.768911176 +0000 @@ -107,11 +107,11 @@ } @@ -365,8 +365,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-11-11 07:02:18.768911176 +0000 @@ -121,7 +121,7 @@ /** * Mapping between mode names and Mode instances. @@ -395,8 +395,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-11-11 07:02:18.768911176 +0000 @@ -38,8 +38,8 @@ final class SymbolTable { @@ -479,8 +479,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-11-11 07:02:18.768911176 +0000 @@ -70,7 +70,7 @@ protected SyntaxTreeNode _parent; // Parent node private Stylesheet _stylesheet; // Stylesheet ancestor node @@ -509,8 +509,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-11-11 07:02:18.768911176 +0000 @@ -127,7 +127,7 @@ * times. Note that patterns whose kernels are "*", "node()" * and "@*" can between shared by test sequences. @@ -521,8 +521,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-11-11 07:02:18.768911176 +0000 @@ -37,7 +37,7 @@ public final class MultiHashtable<K,V> { static final long serialVersionUID = -6151608290510033572L; @@ -542,8 +542,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-11-11 07:02:18.768911176 +0000 @@ -170,7 +170,7 @@ _parser = new Parser(this, useServicesMechanism); _featureManager = featureManager; @@ -572,8 +572,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-11-11 07:02:18.768911176 +0000 @@ -169,7 +169,7 @@ _count = 0; _current = 0; @@ -584,8 +584,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-11-11 07:02:18.768911176 +0000 @@ -60,7 +60,7 @@ */ public DOMWSFilter(AbstractTranslet translet) { @@ -596,8 +596,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-11-11 07:02:18.768911176 +0000 @@ -59,7 +59,7 @@ /** * A mapping from a document node to the mapping between values and nodesets @@ -626,8 +626,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-11-11 07:02:18.768911176 +0000 @@ -56,7 +56,7 @@ private int _free; private int _size; @@ -638,8 +638,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-11-11 07:02:18.768911176 +0000 @@ -114,7 +114,7 @@ private int _namesSize = -1; @@ -659,8 +659,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-11-11 07:02:18.768911176 +0000 @@ -279,7 +279,7 @@ */ public void addDecimalFormat(String name, DecimalFormatSymbols symbols) { @@ -689,8 +689,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-11-11 07:02:18.772911111 +0000 @@ -58,7 +58,7 @@ private ContentHandler _sax = null; private LexicalHandler _lex = null; @@ -701,8 +701,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-07-28 16:22:54.329235431 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -407,7 +407,7 @@ _class = new Class[classCount]; @@ -713,8 +713,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -1189,7 +1189,7 @@ if (_isIdentity) { @@ -725,8 +725,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -393,7 +393,7 @@ if (identifiers != null) { @@ -828,8 +828,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -2059,7 +2059,7 @@ // create Map @@ -840,8 +840,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -249,7 +249,7 @@ filter, entityReferenceExpansion); @@ -933,8 +933,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -478,7 +478,7 @@ public Object setUserData(String key, Object data, UserDataHandler handler) { @@ -962,8 +962,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-11-11 07:02:18.772911111 +0000 @@ -37,7 +37,7 @@ class LCount @@ -974,8 +974,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-11-11 07:02:18.772911111 +0000 @@ -62,7 +62,7 @@ /** Default constructor. */ @@ -986,8 +986,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-11-11 07:02:18.772911111 +0000 @@ -210,13 +210,13 @@ // other information @@ -1015,8 +1015,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -38,7 +38,7 @@ static final Map<String, DatatypeValidator> fBuiltInTypes; @@ -1036,8 +1036,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2016-11-11 07:02:18.772911111 +0000 @@ -37,7 +37,7 @@ static Map<String, DatatypeValidator> XML11BUILTINTYPES; @@ -1057,8 +1057,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2016-11-11 07:02:18.772911111 +0000 @@ -364,7 +364,7 @@ // entities @@ -1069,8 +1069,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2016-11-11 07:02:18.772911111 +0000 @@ -192,7 +192,7 @@ // caller to specify the location of the error being // reported. -Ac @@ -1081,8 +1081,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2016-11-11 07:02:18.772911111 +0000 @@ -374,8 +374,8 @@ static private Map<String, Token> ranges2 = null; static synchronized protected RangeToken getRange(String name, boolean positive) { @@ -1095,8 +1095,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2016-11-11 07:02:18.772911111 +0000 @@ -593,8 +593,8 @@ } @@ -1136,8 +1136,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2016-11-11 07:02:18.772911111 +0000 @@ -859,10 +859,10 @@ private SymbolTable fSymbolTable; @@ -1152,8 +1152,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2016-07-28 16:22:54.333235367 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2016-11-11 07:02:18.776911045 +0000 @@ -176,10 +176,10 @@ // - a Vector, which contains all elements that has this element as their // substitution group affilication @@ -1168,8 +1168,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2016-11-11 07:02:18.776911045 +0000 @@ -467,7 +467,7 @@ // Constructors @@ -1180,8 +1180,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2016-11-11 07:02:18.776911045 +0000 @@ -489,7 +489,7 @@ /** Schema Grammar Description passed, to give a chance to application to supply the Grammar */ @@ -1213,8 +1213,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2016-11-11 07:02:18.776911045 +0000 @@ -102,7 +102,7 @@ // Create the Map if none existed before @@ -1234,8 +1234,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2016-11-11 07:02:18.776911045 +0000 @@ -186,7 +186,7 @@ private void putInFeatures(String name, boolean value){ @@ -1246,8 +1246,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2016-11-11 07:02:18.776911045 +0000 @@ -85,7 +85,7 @@ private static final Map<String, String> KNOWN_LOADERS; @@ -1267,8 +1267,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2016-11-11 07:02:18.776911045 +0000 @@ -241,7 +241,7 @@ } @@ -1279,8 +1279,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2016-11-11 07:02:18.776911045 +0000 @@ -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. @@ -1291,8 +1291,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2016-11-11 07:02:18.776911045 +0000 @@ -489,8 +489,8 @@ // @@ -1305,8 +1305,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2016-11-11 07:02:18.776911045 +0000 @@ -144,7 +144,7 @@ Map<String, Integer> cache; @@ -1317,8 +1317,8 @@ } else { cache = caches[index]; 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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2016-11-11 07:02:18.776911045 +0000 @@ -47,7 +47,7 @@ */ public class CustomStringPool extends DTMStringPool { @@ -1329,8 +1329,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2016-11-11 07:02:18.776911045 +0000 @@ -162,7 +162,7 @@ * This table holds the ID string to node associations, for * XML IDs. @@ -1341,8 +1341,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2016-11-11 07:02:18.776911045 +0000 @@ -59,7 +59,7 @@ * (e.g., 'BASE' or 'SYSTEM') to their type (1, 2, etc.). * Names are case sensitive. @@ -1353,8 +1353,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2016-11-11 07:02:18.776911045 +0000 @@ -341,7 +341,7 @@ * vector. This allows the Catalog to quickly locate the reader * for a particular MIME type.</p> @@ -1365,8 +1365,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2016-11-11 07:02:18.776911045 +0000 @@ -63,13 +63,13 @@ public static final String xmlCatalogSysId = "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"; @@ -1385,8 +1385,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2016-11-11 07:02:18.776911045 +0000 @@ -78,7 +78,7 @@ * or "{namespaceuri}elementname". The former is used if the * namespace URI is null.</p> @@ -1397,8 +1397,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2016-11-11 07:02:18.776911045 +0000 @@ -89,7 +89,7 @@ * or "{namespaceuri}elementname". The former is used if the * namespace URI is null.</p> @@ -1409,8 +1409,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2016-07-28 16:22:54.337235302 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2016-11-11 07:02:18.776911045 +0000 @@ -820,7 +820,7 @@ throws SAXException { @@ -1421,8 +1421,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2016-11-11 07:02:18.780910979 +0000 @@ -371,8 +371,8 @@ if ( _byName != null ) return; @@ -1453,8 +1453,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2016-11-11 07:02:18.780910979 +0000 @@ -48,7 +48,7 @@ * The keys to the hashtable to find the index are either * "prefix:localName" or "{uri}localName". @@ -1465,8 +1465,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 2016-07-28 16:17:31.482470964 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2016-11-11 06:59:42.103470357 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2016-11-11 07:02:18.780910979 +0000 @@ -297,8 +297,8 @@ // private final static class EncodingInfos { @@ -1488,8 +1488,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/DOMHelper.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java 2016-11-11 07:02:18.780910979 +0000 @@ -563,7 +563,7 @@ /** * An experiment for the moment. @@ -1500,8 +1500,8 @@ /** Object to put into the m_NSInfos table that tells that a node has not been * processed, but has xmlns namespace decls. */ 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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2016-11-11 07:02:18.780910979 +0000 @@ -159,7 +159,7 @@ { @@ -1512,8 +1512,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2016-11-11 07:02:18.780910979 +0000 @@ -333,10 +333,10 @@ public static final String FUNC_DOCLOCATION_STRING = "document-location"; @@ -1530,8 +1530,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2016-11-11 07:02:18.780910979 +0000 @@ -140,7 +140,7 @@ private int fAttributeDeclNextAttributeDeclIndex[][] = new int[INITIAL_CHUNK_COUNT][]; @@ -1551,8 +1551,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2016-11-11 07:02:18.780910979 +0000 @@ -63,7 +63,7 @@ protected boolean fWarnDuplicateEntityDef; @@ -1563,8 +1563,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 2016-07-28 14:59:44.000000000 +0100 -+++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2016-10-28 08:01:30.000000000 +0100 ++++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2016-11-11 07:02:18.780910979 +0000 @@ -465,7 +465,7 @@ */ public Enumeration getPrefixes (String uri) @@ -1608,8 +1608,8 @@ } 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2016-11-11 07:02:18.780910979 +0000 @@ -63,9 +63,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -1625,8 +1625,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2016-11-11 07:02:18.780910979 +0000 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -1646,8 +1646,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2016-11-11 07:02:18.780910979 +0000 @@ -45,7 +45,7 @@ private final Kind keyKind; // a reference kind for the cache keys private final Kind valueKind; // a reference kind for the cache values @@ -1694,8 +1694,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2016-11-11 07:02:18.780910979 +0000 @@ -103,9 +103,9 @@ return this.def.compareTo(that.def); } @@ -1767,8 +1767,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 2016-07-28 16:17:32.246458578 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2016-07-28 19:19:16.268317384 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2016-11-11 07:02:18.780910979 +0000 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -1837,8 +1837,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 2016-07-28 16:17:31.422471938 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2016-11-11 06:59:40.979488720 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2016-11-11 07:02:18.780910979 +0000 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -1849,8 +1849,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2016-11-11 07:02:18.780910979 +0000 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -1887,8 +1887,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2016-07-28 16:22:54.341235236 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2016-11-11 07:02:18.780910979 +0000 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -1899,8 +1899,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2016-11-11 07:02:18.780910979 +0000 @@ -917,7 +917,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -1929,8 +1929,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 2016-07-28 16:17:32.246458578 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2016-11-11 07:02:18.780910979 +0000 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -1968,8 +1968,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2016-11-11 07:02:18.780910979 +0000 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -1980,8 +1980,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2016-07-28 19:21:33.106072940 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2016-11-11 07:02:18.784910915 +0000 @@ -126,11 +126,11 @@ public void setBytes(byte[] newBytes) { if (bytes == newBytes) return; @@ -2006,8 +2006,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 2016-07-28 16:17:31.422471938 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2016-07-28 16:27:59.304284469 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2016-11-11 06:59:41.247484342 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2016-11-11 07:02:18.784910915 +0000 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -2172,8 +2172,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 2016-07-28 16:17:32.250458513 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2016-07-28 16:27:25.248838015 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2016-11-11 07:02:18.784910915 +0000 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -2287,8 +2287,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 2016-07-28 16:17:32.250458513 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2016-07-28 16:27:12.929038261 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2016-11-11 07:02:18.784910915 +0000 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -2344,8 +2344,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2016-11-11 07:02:18.784910915 +0000 @@ -181,8 +181,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -2376,8 +2376,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2016-11-11 07:02:18.784910915 +0000 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -2388,8 +2388,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 2016-07-28 16:17:32.250458513 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2016-07-28 16:26:22.753853799 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2016-11-11 07:02:18.784910915 +0000 @@ -47,8 +47,8 @@ */ @@ -2411,8 +2411,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2016-11-11 07:02:18.784910915 +0000 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -2433,8 +2433,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 2016-07-28 16:17:32.250458513 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2016-11-11 07:02:18.784910915 +0000 @@ -232,7 +232,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -2445,8 +2445,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 2016-07-28 16:17:32.250458513 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2016-11-11 07:02:18.784910915 +0000 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -2457,8 +2457,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2016-11-11 07:02:18.784910915 +0000 @@ -56,7 +56,7 @@ // principal in the delegated subject // @@ -2468,9 +2468,21 @@ for(Principal p : ps) { 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/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 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2016-11-11 07:02:18.784910915 +0000 +@@ -1571,7 +1571,7 @@ + private void notifyUnsolicited(Object e) { + Vector<LdapCtx> unsolicitedCopy; + synchronized (unsolicited) { +- unsolicitedCopy = new Vector<>(unsolicited); ++ unsolicitedCopy = new Vector<LdapCtx>(unsolicited); + if (e instanceof NamingException) { + unsolicited.setSize(0); // no more listeners after exception + } 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2016-11-11 07:02:18.784910915 +0000 @@ -54,7 +54,7 @@ * Contains event dispatcher per thread group. */ @@ -2481,8 +2493,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2016-11-11 07:02:18.784910915 +0000 @@ -102,7 +102,7 @@ && !SoundbankReader.class.equals(serviceClass) && !MidiFileWriter.class.equals(serviceClass) @@ -2493,8 +2505,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2016-11-11 07:02:18.784910915 +0000 @@ -59,7 +59,7 @@ * dispatcher instance with a factory in EventDispatcher */ @@ -2505,8 +2517,8 @@ /** * All RealTimeSequencers share this info object. 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2016-11-11 07:02:18.784910915 +0000 @@ -231,7 +231,7 @@ * Create an empty ExecOptionPermissionCollection. */ @@ -2517,8 +2529,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2016-07-28 16:22:54.345235171 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2016-11-11 07:02:18.784910915 +0000 @@ -235,7 +235,7 @@ * Create an empty ExecPermissionCollection. */ @@ -2529,8 +2541,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2016-11-11 07:02:18.788910849 +0000 @@ -1285,7 +1285,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -2550,8 +2562,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2016-11-11 07:02:18.788910849 +0000 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -2562,8 +2574,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2016-11-11 07:02:18.788910849 +0000 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -2578,8 +2590,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2016-11-11 07:02:18.788910849 +0000 @@ -152,7 +152,7 @@ // new configuration @@ -2608,8 +2620,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2016-11-11 07:02:18.788910849 +0000 @@ -181,7 +181,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -2620,8 +2632,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2016-11-11 07:02:18.788910849 +0000 @@ -654,7 +654,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -2632,8 +2644,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2016-11-11 07:02:18.788910849 +0000 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -2644,8 +2656,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2016-11-11 07:02:18.788910849 +0000 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -2656,8 +2668,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2016-11-11 07:02:18.788910849 +0000 @@ -1179,7 +1179,7 @@ // Done return certs; @@ -2668,8 +2680,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2016-11-11 07:02:18.788910849 +0000 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -2680,8 +2692,8 @@ EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { super("event-handler"); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2016-11-11 07:02:18.788910849 +0000 @@ -97,7 +97,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -2710,8 +2722,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2016-11-11 07:02:18.788910849 +0000 @@ -44,7 +44,7 @@ } else { @@ -2731,8 +2743,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2016-07-28 16:22:54.349235107 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2016-11-11 07:02:18.788910849 +0000 @@ -96,7 +96,7 @@ BeanInfo putBeanInfo(Class<?> type, BeanInfo info) { @@ -2743,8 +2755,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2016-11-11 07:02:18.788910849 +0000 @@ -34,7 +34,7 @@ */ @@ -2764,8 +2776,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2016-11-11 07:02:18.788910849 +0000 @@ -61,7 +61,7 @@ private volatile boolean closed = false; @@ -2776,8 +2788,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2016-11-11 07:02:18.788910849 +0000 @@ -1150,7 +1150,7 @@ if ((names == null) || (filter == null)) { return names; @@ -2806,8 +2818,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2016-11-11 07:02:18.788910849 +0000 @@ -76,7 +76,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -2818,8 +2830,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2016-11-11 07:02:18.792910783 +0000 @@ -725,7 +725,7 @@ */ @@ -2848,8 +2860,8 @@ } } 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2016-11-11 07:02:18.792910783 +0000 @@ -217,7 +217,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -2874,8 +2886,8 @@ /** filter stream for handling block data conversion */ 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2016-11-11 07:02:18.792910783 +0000 @@ -166,11 +166,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -2900,8 +2912,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2016-11-11 07:02:18.792910783 +0000 @@ -87,18 +87,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -2991,8 +3003,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2016-11-11 07:02:18.792910783 +0000 @@ -47,7 +47,7 @@ } } @@ -3003,8 +3015,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2016-11-11 07:02:18.792910783 +0000 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -3025,8 +3037,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2016-11-11 07:02:18.792910783 +0000 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -3037,8 +3049,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2016-11-11 07:02:18.792910783 +0000 @@ -1359,7 +1359,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -3091,8 +3103,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2016-07-28 16:22:54.353235042 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2016-11-11 07:02:18.792910783 +0000 @@ -248,7 +248,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -3199,8 +3211,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2016-11-11 07:02:18.796910719 +0000 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -3242,8 +3254,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 2016-07-28 16:17:32.306457606 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2016-11-11 06:59:43.919440688 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2016-11-11 07:02:18.796910719 +0000 @@ -393,7 +393,7 @@ } private boolean isPlaceholder() { return clazz == null; } @@ -3254,8 +3266,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2016-11-11 07:02:18.796910719 +0000 @@ -290,7 +290,7 @@ if (UNSAFE.shouldBeInitialized(type)) // If the previous call didn't block, this can happen. @@ -3266,8 +3278,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 2016-07-28 16:17:32.306457606 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2016-11-11 06:59:43.919440688 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2016-11-11 07:02:18.796910719 +0000 @@ -129,7 +129,7 @@ static { @@ -3287,8 +3299,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 2016-07-28 16:17:32.306457606 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2016-11-11 06:59:43.919440688 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2016-11-11 07:02:18.796910719 +0000 @@ -468,12 +468,12 @@ int capacity = 512; // expect many distinct signatures over time float loadFactor = 0.75f; // normal default @@ -3305,8 +3317,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 2016-07-28 16:17:32.230458838 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-11-11 06:59:43.879441342 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-11-11 07:02:18.796910719 +0000 @@ -808,14 +808,14 @@ // JVM returned to us with an intentional overflow! totalCount += buf.length; @@ -3325,8 +3337,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 2016-07-28 16:17:32.306457606 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2016-11-11 06:59:43.919440688 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2016-11-11 07:02:18.796910719 +0000 @@ -73,8 +73,8 @@ static final class ArrayAccessor { @@ -3348,8 +3360,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2016-11-11 07:02:18.796910719 +0000 @@ -834,7 +834,7 @@ } } @@ -3360,8 +3372,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2016-11-11 07:02:18.796910719 +0000 @@ -1951,7 +1951,7 @@ int inargs = outargs + dropped; if (pos < 0 || pos >= inargs) @@ -3372,8 +3384,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2016-11-11 07:02:18.796910719 +0000 @@ -1048,7 +1048,7 @@ private final float loadFactor; @@ -3384,8 +3396,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 2016-07-28 16:17:32.218459032 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2016-11-11 06:59:43.867441538 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2016-11-11 07:02:18.796910719 +0000 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -3396,8 +3408,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2016-11-11 07:02:18.796910719 +0000 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -3435,8 +3447,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 2016-07-28 16:17:32.250458513 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2016-11-11 07:02:18.796910719 +0000 @@ -599,13 +599,16 @@ } @@ -3458,8 +3470,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 2016-07-28 16:17:32.218459032 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2016-11-11 06:59:43.867441538 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2016-11-11 07:02:18.796910719 +0000 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -3479,8 +3491,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2016-11-11 07:02:18.796910719 +0000 @@ -137,7 +137,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -3491,8 +3503,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 2016-07-28 16:17:32.218459032 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2016-11-11 06:59:43.867441538 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2016-11-11 07:02:18.796910719 +0000 @@ -234,7 +234,7 @@ * a cache of proxy classes */ @@ -3512,8 +3524,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2016-11-11 07:02:18.796910719 +0000 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -3524,8 +3536,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2016-11-11 07:02:18.796910719 +0000 @@ -71,12 +71,12 @@ } @@ -3579,8 +3591,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2016-11-11 07:02:18.796910719 +0000 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -3594,8 +3606,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2016-07-28 16:22:54.357234977 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2016-11-11 07:02:18.800910654 +0000 @@ -2282,7 +2282,7 @@ int off = 0; int next = 0; @@ -3606,8 +3618,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2016-11-11 07:02:18.800910654 +0000 @@ -1638,7 +1638,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -3633,8 +3645,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2016-11-11 07:02:18.800910654 +0000 @@ -918,7 +918,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -3654,8 +3666,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2016-11-11 07:02:18.800910654 +0000 @@ -733,7 +733,7 @@ static InetAddressImpl impl; @@ -3674,10 +3686,22 @@ long now = System.currentTimeMillis(); 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 2016-11-11 07:34:41.921179275 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/SocketPermission.java 2016-11-11 07:35:33.460364672 +0000 +@@ -1453,7 +1453,7 @@ + // Don't call out.defaultWriteObject() + + // Write out Vector +- Vector<SocketPermission> permissions = new Vector<>(perms.size()); ++ Vector<SocketPermission> permissions = new Vector<SocketPermission>(perms.size()); + + 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2016-07-28 16:22:54.361234912 +0100 -@@ -205,7 +205,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2016-11-11 07:02:18.800910654 +0000 +@@ -198,7 +198,7 @@ */ private WeakHashMap<Closeable,Void> @@ -3686,9 +3710,33 @@ /** * 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 2016-11-11 07:34:41.933179085 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLConnection.java 2016-11-11 07:35:44.404191658 +0000 +@@ -1237,7 +1237,7 @@ + factory = fac; + } + +- private static Hashtable<String, ContentHandler> handlers = new Hashtable<>(); ++ private static Hashtable<String, ContentHandler> handlers = new Hashtable<String, ContentHandler>(); + + /** + * 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 2016-11-11 07:34:41.949178832 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/URL.java 2016-11-11 07:35:18.408602606 +0000 +@@ -1126,7 +1126,7 @@ + /** + * A table of protocol handlers. + */ +- static Hashtable<String,URLStreamHandler> handlers = new Hashtable<>(); ++ static Hashtable<String,URLStreamHandler> handlers = new Hashtable<String,URLStreamHandler>(); + private static Object streamHandlerLock = new Object(); + + // 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 2016-07-28 16:17:32.254458448 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2016-11-11 06:59:43.899441015 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2016-11-11 07:03:20.363905197 +0000 @@ -1504,7 +1504,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -3708,8 +3756,8 @@ String line = reader.readLine(); if (line == null) 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2016-11-11 07:02:18.800910654 +0000 @@ -134,7 +134,7 @@ this.context = null; } @@ -3720,8 +3768,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2016-11-11 07:02:18.800910654 +0000 @@ -514,7 +514,7 @@ // Copy perms into a Hashtable @@ -3732,8 +3780,8 @@ synchronized (this) { permissions.putAll(perms); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2016-11-11 07:02:18.800910654 +0000 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -3757,8 +3805,8 @@ int j = i; 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2016-11-11 07:02:18.800910654 +0000 @@ -361,7 +361,7 @@ // Copy perms into a Hashtable @@ -3778,8 +3826,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2016-11-11 07:02:18.800910654 +0000 @@ -109,7 +109,7 @@ // PolicyInfo is stored in an AtomicReference @@ -3799,8 +3847,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2016-11-11 07:02:18.800910654 +0000 @@ -400,8 +400,8 @@ int swag = 32; int vcap = 8; @@ -3813,8 +3861,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2016-07-28 16:25:48.730406302 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2016-11-11 07:02:18.800910654 +0000 @@ -434,7 +434,7 @@ private void readObject(ObjectInputStream in) @@ -3843,8 +3891,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2016-11-11 07:02:18.800910654 +0000 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -3855,8 +3903,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2016-07-28 16:25:37.686585473 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2016-11-11 07:02:18.800910654 +0000 @@ -544,7 +544,7 @@ value = filter.substring(index + 1); } @@ -3903,8 +3951,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2016-11-11 07:02:18.800910654 +0000 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -3942,8 +3990,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2016-11-11 07:02:18.800910654 +0000 @@ -196,7 +196,7 @@ if (this.certs == null) { // extract the signer certs @@ -3954,8 +4002,8 @@ while (i < certs.length) { signerCerts.add(certs[i]); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2016-07-28 16:22:54.361234912 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2016-11-11 07:02:18.800910654 +0000 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -3985,8 +4033,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2016-11-11 07:02:18.804910588 +0000 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -3997,8 +4045,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java openjdk-boot/jdk/src/share/classes/java/util/Collections.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2016-11-11 07:02:18.804910588 +0000 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -4624,8 +4672,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java openjdk-boot/jdk/src/share/classes/java/util/Currency.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2016-07-28 16:17:32.254458448 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2016-11-11 06:59:43.903440949 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2016-11-11 07:02:18.804910588 +0000 @@ -101,7 +101,7 @@ // class data: instance map @@ -4636,8 +4684,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2016-11-11 07:02:18.804910588 +0000 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -4648,8 +4696,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2016-11-11 07:02:18.804910588 +0000 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -4672,8 +4720,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 2016-07-28 16:17:32.222458967 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2016-11-11 06:59:43.871441472 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2016-11-11 07:02:18.804910588 +0000 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -4684,8 +4732,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2016-11-11 07:02:18.804910588 +0000 @@ -894,7 +894,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -4696,8 +4744,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2016-11-11 07:02:18.804910588 +0000 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -4744,8 +4792,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2016-11-11 07:02:18.804910588 +0000 @@ -538,7 +538,7 @@ // Creates the new entry. @@ -4801,8 +4849,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2016-11-11 07:02:18.804910588 +0000 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -4822,8 +4870,8 @@ a[size] = null; return a; 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2016-11-11 07:02:18.804910588 +0000 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -4834,8 +4882,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2016-11-11 07:02:18.804910588 +0000 @@ -238,7 +238,7 @@ */ @Override @@ -4855,8 +4903,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2016-11-11 07:02:18.804910588 +0000 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -4894,8 +4942,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2016-11-11 07:02:18.804910588 +0000 @@ -187,7 +187,7 @@ return; @@ -4906,8 +4954,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2016-07-28 16:22:54.365234848 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2016-11-11 07:02:18.804910588 +0000 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -4918,8 +4966,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2016-11-11 07:02:18.808910522 +0000 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -4930,8 +4978,8 @@ // A metered stream is a subclass of OutputStream that // (a) forwards all its output to a target stream 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2016-11-11 07:02:18.808910522 +0000 @@ -518,8 +518,8 @@ // were final, the following KnownLevel implementation can be removed. // Future API change should take this into consideration. @@ -4961,8 +5009,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2016-11-11 07:02:18.808910522 +0000 @@ -177,7 +177,7 @@ private volatile LogManager manager; private String name; @@ -4982,8 +5030,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2016-11-11 07:02:18.808910522 +0000 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -4994,8 +5042,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2016-11-11 07:02:18.808910522 +0000 @@ -389,7 +389,7 @@ // find the AppContext of the applet code // will be null if we are in the main app context. @@ -5051,8 +5099,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2016-11-11 07:02:18.808910522 +0000 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -5064,8 +5112,8 @@ /** * @serial Logging message level 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2016-11-11 07:02:18.808910522 +0000 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -5096,8 +5144,8 @@ /** * These two classes are used to distinguish NodeChangeEvents on 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2016-11-11 07:02:18.808910522 +0000 @@ -538,7 +538,7 @@ cursor--; else { @@ -5108,8 +5156,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2016-11-11 07:02:18.808910522 +0000 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -5120,8 +5168,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2016-11-11 07:02:18.808910522 +0000 @@ -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> @@ -5159,8 +5207,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2016-11-11 07:02:18.808910522 +0000 @@ -193,8 +193,8 @@ } }; @@ -5173,8 +5221,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2016-11-11 07:02:18.808910522 +0000 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -5185,8 +5233,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2016-11-11 07:02:18.808910522 +0000 @@ -291,7 +291,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -5251,8 +5299,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2016-11-11 07:02:18.808910522 +0000 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -5281,8 +5329,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2016-11-11 07:02:18.808910522 +0000 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -5293,8 +5341,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2016-07-28 16:22:54.369234782 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2016-11-11 07:02:18.812910458 +0000 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -5350,8 +5398,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2016-11-11 07:02:18.812910458 +0000 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -5419,8 +5467,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2016-11-11 07:02:18.812910458 +0000 @@ -172,7 +172,7 @@ /** * Reference queue for cleared WeakEntries @@ -5453,8 +5501,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2016-11-11 07:02:18.812910458 +0000 @@ -321,7 +321,7 @@ // the outstanding inputstreams that need to be closed, @@ -5483,8 +5531,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2016-11-11 07:02:18.812910458 +0000 @@ -53,8 +53,8 @@ } @@ -5497,8 +5545,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/Cipher.java 2016-07-28 17:31:11.394572587 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/Cipher.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/Cipher.java 2016-11-11 07:02:18.812910458 +0000 @@ -417,7 +417,7 @@ return Collections.singletonList(tr); } else { // if ((mode != null) && (pad != null)) { @@ -5518,8 +5566,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java 2016-07-28 17:32:20.073449989 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java 2016-11-11 07:02:18.812910458 +0000 @@ -172,7 +172,7 @@ * @return an enumeration of all the CryptoAllPermission objects. */ @@ -5530,8 +5578,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2016-07-28 16:25:07.527074756 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2016-11-11 07:02:18.812910458 +0000 @@ -84,7 +84,7 @@ * no CryptoPermissionCollections. */ @@ -5579,8 +5627,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java 2016-07-28 17:32:36.857175661 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java 2016-11-11 07:02:18.812910458 +0000 @@ -252,7 +252,7 @@ // AlgorithmParameterSpec class name. String algParamSpecClassName = match("quoted string"); @@ -5609,8 +5657,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurity.java 2016-07-28 17:32:06.553670972 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurity.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurity.java 2016-11-11 07:02:18.812910458 +0000 @@ -58,11 +58,11 @@ // value == PROVIDER_VERIFIED is successfully verified // value is failure cause Exception in error case @@ -5635,8 +5683,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2016-07-28 16:24:37.495561945 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2016-11-11 07:02:18.812910458 +0000 @@ -52,9 +52,9 @@ private static final CryptoPermissions exemptPolicy; private static final CryptoAllPermission allPerm; @@ -5650,8 +5698,8 @@ new CryptoPermissions(); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2016-11-11 07:02:18.812910458 +0000 @@ -103,7 +103,7 @@ = (String[]) this.env.get(EnvHelp.CREDENTIAL_TYPES); List<String> types = null; @@ -5662,8 +5710,8 @@ if (type == null) { throw new IllegalArgumentException("A credential type is null."); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2016-11-11 07:02:18.812910458 +0000 @@ -116,7 +116,7 @@ return null; } @@ -5674,8 +5722,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2016-11-11 07:02:18.812910458 +0000 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -5686,8 +5734,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2016-11-11 07:02:18.812910458 +0000 @@ -590,7 +590,7 @@ // Don't call out.defaultWriteObject() @@ -5698,8 +5746,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2016-11-11 07:02:18.812910458 +0000 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -5710,8 +5758,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2016-11-11 07:02:18.812910458 +0000 @@ -50,7 +50,7 @@ private Subject subject; @@ -5722,8 +5770,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2016-11-11 07:02:18.812910458 +0000 @@ -267,7 +267,7 @@ private static Collection<JInternalFrame> getAllFrames(Container parent) { @@ -5734,8 +5782,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2016-11-11 07:02:18.812910458 +0000 @@ -58,7 +58,7 @@ public class Sockets { @@ -5782,8 +5830,8 @@ set.add(StandardSocketOptions.SO_RCVBUF); set.add(StandardSocketOptions.SO_REUSEADDR); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2016-11-11 07:02:18.812910458 +0000 @@ -109,7 +109,7 @@ * Note that this only applies to createFont() from an InputStream object. */ @@ -5794,8 +5842,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 2016-07-28 16:17:32.306457606 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2016-11-11 06:59:43.923440623 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2016-11-11 07:02:18.812910458 +0000 @@ -60,7 +60,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap<?,?>[n]; @@ -5833,8 +5881,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2016-11-11 07:02:18.812910458 +0000 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -5845,8 +5893,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2016-11-11 07:02:18.812910458 +0000 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -5857,8 +5905,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2016-11-11 07:02:18.812910458 +0000 @@ -61,7 +61,7 @@ TagCache(LCMSProfile p) { @@ -5869,8 +5917,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 2016-07-28 16:17:32.254458448 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2016-11-11 06:59:43.903440949 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2016-11-11 07:02:18.812910458 +0000 @@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -5908,8 +5956,8 @@ System.err.println("Incoming arguments:"); } 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2016-11-11 07:02:18.816910392 +0000 @@ -120,7 +120,7 @@ String key = null, value = null; @@ -5920,8 +5968,8 @@ while (true) { key = getEntry(); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2016-11-11 07:02:18.816910392 +0000 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -5932,8 +5980,8 @@ .getDirectBufferPool())); bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2016-11-11 07:02:18.816910392 +0000 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -5961,9 +6009,33 @@ Attributes attrs; // 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 2016-11-11 18:31:30.755793448 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/TransferProtocolClient.java 2016-11-11 18:31:49.331488672 +0000 +@@ -42,7 +42,7 @@ + + /** Array of strings (usually 1 entry) for the last reply + from the server. */ +- protected Vector<String> serverResponse = new Vector<>(1); ++ protected Vector<String> serverResponse = new Vector<String>(1); + + /** 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 2016-11-11 07:34:41.957178706 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java 2016-11-11 07:37:12.046805574 +0000 +@@ -139,7 +139,7 @@ + this.dontUseNegotiate = dontUseNegotiate; + this.rsp = response; + this.hdrname = hdrname; +- this.schemes = new HashMap<>(); ++ this.schemes = new HashMap<String, SchemeMapValue>(); + parse(disabledSchemes); + } + 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2016-07-28 16:22:54.373234717 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2016-11-11 07:02:18.816910392 +0000 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -5974,9 +6046,18 @@ /* 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2016-07-28 16:22:54.373234717 +0100 -@@ -2660,7 +2660,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2016-11-11 07:02:18.816910392 +0000 +@@ -224,7 +224,7 @@ + if (list == null || list.isEmpty()) + return Collections.emptySet(); + +- Set<String> s = new HashSet<>(); ++ Set<String> s = new HashSet<String>(); + String[] parts = list.split("\\s*,\\s*"); + for (String part : parts) + s.add(part.toLowerCase(Locale.ROOT)); +@@ -2719,7 +2719,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -5985,7 +6066,7 @@ if (cachedHeaders != null) headers = cachedHeaders.getHeaders(); -@@ -2669,7 +2669,7 @@ +@@ -2728,7 +2728,7 @@ for (Map.Entry<String, List<String>> e: headers.entrySet()) { String key = e.getKey(); @@ -5994,10 +6075,19 @@ for (String value : values) { String fVal = filterHeaderField(key, value); if (fVal != null) +@@ -2910,7 +2910,7 @@ + */ + Map<String, List<String>> userCookiesMap = null; + if (userCookies != null || userCookies2 != null) { +- userCookiesMap = new HashMap<>(); ++ userCookiesMap = new HashMap<String, List<String>>(); + if (userCookies != null) { + userCookiesMap.put("Cookie", Arrays.asList(userCookies)); + } 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2016-07-28 16:22:54.373234717 +0100 -@@ -239,7 +239,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2016-11-11 07:02:18.816910392 +0000 +@@ -234,7 +234,7 @@ url = null; } @@ -6007,8 +6097,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2016-11-11 07:02:18.816910392 +0000 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -6046,8 +6136,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2016-11-11 07:02:18.816910392 +0000 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -6058,8 +6148,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2016-11-11 07:02:18.816910392 +0000 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -6072,8 +6162,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2016-11-11 07:02:18.816910392 +0000 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -6084,8 +6174,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2016-11-11 07:02:18.816910392 +0000 @@ -77,7 +77,7 @@ throws IOException { @@ -6105,8 +6195,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2016-11-11 07:02:18.816910392 +0000 @@ -71,7 +71,7 @@ @Override @@ -6117,8 +6207,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2016-11-11 07:02:18.816910392 +0000 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -6138,8 +6228,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 2016-07-28 16:17:31.422471938 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2016-11-11 06:59:41.251484276 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2016-11-11 07:02:18.816910392 +0000 @@ -442,7 +442,7 @@ Map<String, Class<?>> memberTypes = annotationType.memberTypes(); @@ -6150,8 +6240,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2016-11-11 07:02:18.816910392 +0000 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -6216,8 +6306,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2016-11-11 07:02:18.816910392 +0000 @@ -78,9 +78,9 @@ /* indicate compatibility with JDK 1.1.x version of class */ private static final long serialVersionUID = 4666870661827494597L; @@ -6231,8 +6321,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2016-11-11 07:02:18.816910392 +0000 @@ -160,7 +160,7 @@ } @@ -6243,8 +6333,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2016-11-11 07:02:18.816910392 +0000 @@ -184,7 +184,7 @@ destDir = null; flags = F_WARNINGS; @@ -6264,8 +6354,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2016-11-11 07:02:18.816910392 +0000 @@ -61,7 +61,7 @@ */ public class RMIGenerator implements RMIConstants, Generator { @@ -6285,8 +6375,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 2016-07-28 16:17:32.222458967 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2016-11-11 06:59:43.871441472 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2016-11-11 07:02:18.816910392 +0000 @@ -66,10 +66,10 @@ /** maps persistent IDs to activated remote objects */ @@ -6301,8 +6391,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 2016-07-28 16:17:32.258458384 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2016-11-11 06:59:43.903440949 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2016-11-11 07:02:18.816910392 +0000 @@ -149,10 +149,10 @@ /** maps activation id to its respective group id */ @@ -6359,8 +6449,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 2016-07-28 16:17:32.222458967 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2016-11-11 06:59:43.871441472 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2016-11-11 07:02:18.816910392 +0000 @@ -113,11 +113,11 @@ * garbage collected. */ @@ -6385,8 +6475,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2016-11-11 07:02:18.816910392 +0000 @@ -76,14 +76,14 @@ /** table to hold sun classes to which access is explicitly permitted */ @@ -6405,8 +6495,8 @@ /** * 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2016-11-11 07:02:18.820910327 +0000 @@ -538,7 +538,7 @@ HashToMethod_Maps() {} @@ -6417,8 +6507,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2016-11-11 07:02:18.820910327 +0000 @@ -207,7 +207,7 @@ * @throws NullPointerException if remoteClass is null */ @@ -6429,8 +6519,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2016-11-11 07:02:18.820910327 +0000 @@ -46,7 +46,7 @@ **/ public abstract class WeakClassHashMap<V> { @@ -6441,8 +6531,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2016-11-11 07:02:18.820910327 +0000 @@ -43,7 +43,7 @@ private boolean dgcAckNeeded = false; @@ -6453,8 +6543,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2016-11-11 07:02:18.820910327 +0000 @@ -78,7 +78,7 @@ Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>()); @@ -6465,8 +6555,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2016-11-11 07:02:18.820910327 +0000 @@ -193,9 +193,9 @@ private DGC dgc; @@ -6538,8 +6628,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2016-11-11 07:02:18.820910327 +0000 @@ -88,7 +88,7 @@ /** remote implementation of DGC interface for this VM */ private static DGCImpl dgc; @@ -6568,8 +6658,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2016-11-11 07:02:18.820910327 +0000 @@ -62,9 +62,9 @@ /** tables mapping to Target, keyed from ObjectEndpoint and impl object */ @@ -6592,8 +6682,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2016-11-11 07:02:18.820910327 +0000 @@ -116,7 +116,7 @@ /* construct table mapping command strings to handlers */ private static Hashtable<String, CGICommandHandler> commandLookup; @@ -6604,8 +6694,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 2016-07-28 16:17:32.258458384 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2016-11-11 06:59:43.903440949 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2016-11-11 07:02:18.820910327 +0000 @@ -75,13 +75,13 @@ /** table of hosts successfully connected to and the factory used */ @@ -6632,8 +6722,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2016-07-28 16:22:54.377234653 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2016-11-11 07:02:18.820910327 +0000 @@ -53,10 +53,10 @@ /** stub for remote object */ private final Remote stub; @@ -6648,8 +6738,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2016-11-11 07:02:18.820910327 +0000 @@ -85,7 +85,7 @@ private DataOutputStream dataOut; @@ -6660,8 +6750,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2016-11-11 07:02:18.820910327 +0000 @@ -64,7 +64,7 @@ private final TCPTransport tr; /** list of cached connections */ @@ -6681,8 +6771,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 2016-07-28 16:17:32.226458903 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2016-11-11 06:59:43.875441407 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2016-11-11 07:02:18.820910327 +0000 @@ -148,7 +148,7 @@ // TBD: should this be a weak hash table? private static final @@ -6693,8 +6783,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2016-11-11 07:02:18.820910327 +0000 @@ -123,7 +123,7 @@ /** client host for the current thread's connection */ @@ -6714,8 +6804,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2016-11-11 07:02:18.820910327 +0000 @@ -66,7 +66,7 @@ Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel); @@ -6726,8 +6816,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2016-11-11 07:02:18.820910327 +0000 @@ -36,7 +36,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -6738,8 +6828,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2016-11-11 07:02:18.820910327 +0000 @@ -41,15 +41,15 @@ // or principal. // @@ -6780,8 +6870,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2016-11-11 07:02:18.820910327 +0000 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -6801,8 +6891,8 @@ } } 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2016-11-11 07:02:18.820910327 +0000 @@ -97,7 +97,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -6840,8 +6930,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2016-11-11 07:02:18.820910327 +0000 @@ -37,7 +37,7 @@ public class Providers { @@ -6852,8 +6942,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2016-11-11 07:02:18.820910327 +0000 @@ -251,7 +251,7 @@ } @@ -6864,8 +6954,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 2016-07-28 16:17:31.422471938 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2016-11-11 06:59:41.251484276 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2016-11-11 07:02:18.820910327 +0000 @@ -610,7 +610,7 @@ } }))); @@ -6943,8 +7033,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2016-11-11 07:02:18.820910327 +0000 @@ -173,7 +173,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -6955,8 +7045,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2016-11-11 07:02:18.820910327 +0000 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -6967,8 +7057,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 2016-07-28 16:17:32.290457865 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2016-11-11 06:59:43.903440949 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2016-11-11 07:02:18.820910327 +0000 @@ -569,7 +569,7 @@ private static String exec(String c) { @@ -6979,8 +7069,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2016-11-11 07:02:18.824910261 +0000 @@ -257,7 +257,7 @@ + configName); } @@ -6991,8 +7081,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2016-11-11 07:02:18.824910261 +0000 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -7003,8 +7093,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2016-11-11 07:02:18.824910261 +0000 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -7024,8 +7114,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2016-11-11 07:02:18.824910261 +0000 @@ -165,7 +165,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -7054,8 +7144,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2016-11-11 07:02:18.824910261 +0000 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -7066,8 +7156,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2016-11-11 07:02:18.824910261 +0000 @@ -150,7 +150,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -7078,8 +7168,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2016-11-11 07:02:18.824910261 +0000 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -7090,8 +7180,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2016-11-11 07:02:18.824910261 +0000 @@ -249,7 +249,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -7102,8 +7192,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 2016-07-28 16:17:32.290457865 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2016-11-11 06:59:43.903440949 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2016-11-11 07:02:18.824910261 +0000 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -7141,8 +7231,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2016-11-11 07:02:18.824910261 +0000 @@ -77,7 +77,7 @@ */ @@ -7153,8 +7243,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2016-11-11 07:02:18.824910261 +0000 @@ -466,7 +466,7 @@ */ static class KdcAccessibility { @@ -7177,8 +7267,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java 2016-07-28 19:29:58.521792849 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java 2016-11-11 07:02:18.824910261 +0000 @@ -85,7 +85,7 @@ // the initial context constructor. This avoids having the initial // context constructor call itself (when processing the URL @@ -7198,8 +7288,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 2016-07-28 16:17:32.226458903 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2016-11-11 06:59:43.879441342 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2016-11-11 07:02:18.824910261 +0000 @@ -265,7 +265,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -7219,8 +7309,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2016-07-28 16:22:54.381234588 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2016-11-11 07:02:18.824910261 +0000 @@ -375,7 +375,7 @@ return null; } @@ -7240,8 +7330,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/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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2016-11-11 07:02:18.824910261 +0000 @@ -894,7 +894,7 @@ // Check for loops in the chain. If there are repeated certs, // the Set of certs in the chain will contain fewer certs than @@ -7252,8 +7342,8 @@ } 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 2016-07-28 21:00:19.541364513 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java 2016-07-28 21:03:20.530404216 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java 2016-11-11 07:02:18.824910261 +0000 @@ -50,7 +50,7 @@ public abstract class CertStoreHelper { @@ -7264,8 +7354,8 @@ classMap.put( "LDAP", 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2016-11-11 07:02:18.824910261 +0000 @@ -586,7 +586,7 @@ // Except the performance improvement, another benefit is to break // the dead loop while looking for the issuer back and forth @@ -7276,8 +7366,8 @@ if (prevKey != null) { // Add the previous certificate as a trust anchor. 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 2016-07-28 21:02:34.611155281 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java 2016-07-28 21:03:10.750564177 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java 2016-11-11 07:02:18.824910261 +0000 @@ -138,7 +138,7 @@ if (selector == null) { return certs; @@ -7288,9 +7378,9 @@ if (selector.match(cert)) { matchedCerts.add(cert); 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 2016-07-28 21:01:55.487795191 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2016-07-28 21:03:00.734727999 +0100 -@@ -330,7 +330,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2016-11-11 06:59:43.907440885 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2016-11-11 07:02:18.824910261 +0000 +@@ -339,7 +339,7 @@ if (selector == null) { return certs; } @@ -7300,8 +7390,8 @@ if (selector.match(cert)) { matchedCerts.add(cert); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2016-11-11 07:02:18.824910261 +0000 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -7312,8 +7402,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2016-11-11 07:02:18.824910261 +0000 @@ -292,7 +292,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -7369,8 +7459,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2016-11-11 07:02:18.824910261 +0000 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -7381,8 +7471,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2016-11-11 07:02:18.824910261 +0000 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -7393,8 +7483,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2016-11-11 07:02:18.824910261 +0000 @@ -431,7 +431,7 @@ int peekByte; byte[] data; @@ -7450,8 +7540,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2016-11-11 07:02:18.824910261 +0000 @@ -57,7 +57,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -7462,8 +7552,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2016-11-11 07:02:18.824910261 +0000 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -7474,8 +7564,8 @@ AccessController.doPrivileged(new PutAllAction(this, map)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2016-11-11 07:02:18.828910196 +0000 @@ -397,7 +397,7 @@ // Map BulkCipher -> Boolean(available) @@ -7486,8 +7576,8 @@ // descriptive name including key size, e.g. AES/128 final String description; 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2016-11-11 07:02:18.828910196 +0000 @@ -752,7 +752,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -7525,8 +7615,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2016-11-11 07:02:18.828910196 +0000 @@ -367,7 +367,7 @@ } } @@ -7537,8 +7627,8 @@ Matcher syntaxMatcher = syntaxPattern.matcher(property); if (syntaxMatcher.matches()) { 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2016-07-28 16:24:02.580128341 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2016-11-11 06:59:41.251484276 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2016-11-11 07:02:18.828910196 +0000 @@ -260,7 +260,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -7557,7 +7647,7 @@ CertificateFactory cf = null; while (chainLen > 0) { -@@ -1350,7 +1350,7 @@ +@@ -1346,7 +1346,7 @@ // read the certificate_authorities int len = input.getInt16(); @@ -7566,7 +7656,7 @@ while (len >= 3) { DistinguishedName dn = new DistinguishedName(input); v.add(dn); -@@ -1742,7 +1742,7 @@ +@@ -1737,7 +1737,7 @@ // Note that this will prevent the Spi classes from being GC'd. We assume // that is not a problem. private final static Map<Class<?>,Object> methodCache = @@ -7576,8 +7666,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 2016-07-28 16:17:32.226458903 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2016-11-11 06:59:43.875441407 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2016-11-11 07:02:18.828910196 +0000 @@ -592,7 +592,7 @@ activeProtocols = getActiveProtocols(); } @@ -7597,8 +7687,8 @@ EnumSet.<CryptoPrimitive>of(CryptoPrimitive.KEY_AGREEMENT); for (ProtocolVersion protocol : enabledProtocols.collection()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2016-07-28 16:17:28.418520642 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2016-11-11 06:59:39.167518324 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2016-11-11 07:02:18.828910196 +0000 @@ -169,7 +169,7 @@ return name; } @@ -7618,8 +7708,8 @@ list.add(toString(format)); } 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2016-11-11 07:02:18.828910196 +0000 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -7630,8 +7720,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2016-11-11 07:02:18.828910196 +0000 @@ -106,7 +106,7 @@ // Initialize the available protocols. @@ -7642,8 +7732,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2016-11-11 07:02:18.828910196 +0000 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -7681,8 +7771,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2016-11-11 07:02:18.828910196 +0000 @@ -48,7 +48,7 @@ } @@ -7720,8 +7810,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2016-07-28 16:22:54.385234523 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2016-11-11 07:02:18.828910196 +0000 @@ -327,7 +327,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -7759,8 +7849,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2016-11-11 07:02:18.828910196 +0000 @@ -642,7 +642,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -7780,8 +7870,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2016-11-11 07:02:18.828910196 +0000 @@ -2561,7 +2561,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -7792,8 +7882,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2016-11-11 07:02:18.828910196 +0000 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -7813,8 +7903,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2016-11-11 07:02:18.828910196 +0000 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -7825,8 +7915,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2016-11-11 06:59:41.251484276 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2016-11-11 07:02:18.828910196 +0000 @@ -309,7 +309,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -7846,8 +7936,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2016-07-28 16:23:42.436455099 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2016-11-11 07:02:18.828910196 +0000 @@ -122,14 +122,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -7874,7 +7964,7 @@ byte[] buffer = new byte[8192]; Enumeration<JarEntry> entries = jf.entries(); -@@ -608,7 +608,7 @@ +@@ -609,7 +609,7 @@ // The map to record display info, only used when -verbose provided // key: signer info string // value: the list of files with common key @@ -7883,7 +7973,7 @@ if (man != null) { if (verbose != null) System.out.println(); -@@ -990,7 +990,7 @@ +@@ -998,7 +998,7 @@ .append(signTimeForm.format(source)).append("]").toString(); } @@ -7892,7 +7982,7 @@ private int inKeyStoreForOneSigner(CodeSigner signer) { if (cacheForInKS.containsKey(signer)) { -@@ -1033,7 +1033,7 @@ +@@ -1041,7 +1041,7 @@ return result; } @@ -7901,7 +7991,7 @@ int inKeyStore(CodeSigner[] signers) { -@@ -1163,7 +1163,7 @@ +@@ -1171,7 +1171,7 @@ * generated one. (This may invalidate existing signatures!) */ BASE64Encoder encoder = new JarBASE64Encoder(); @@ -7910,7 +8000,7 @@ boolean wasSigned = false; -@@ -1532,7 +1532,7 @@ +@@ -1540,7 +1540,7 @@ return SignatureFileVerifier.isSigningRelated(name); } @@ -7919,7 +8009,7 @@ /** * Returns a string of singer info, with a newline at the end -@@ -1633,7 +1633,7 @@ +@@ -1641,7 +1641,7 @@ certificateFactory = CertificateFactory.getInstance("X.509"); validator = CertPathValidator.getInstance("PKIX"); @@ -7930,12 +8020,12 @@ if (caks != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/#Main.java{,.rej# openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/#Main.java{,.rej# --- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/#Main.java{,.rej# 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/#Main.java{,.rej# 2016-07-28 16:23:34.580582530 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/#Main.java{,.rej# 2016-11-11 07:02:18.828910196 +0000 @@ -0,0 +1 @@ + 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 2016-07-28 16:17:32.294457800 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2016-11-11 06:59:43.911440819 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2016-11-11 07:02:18.832910131 +0000 @@ -151,11 +151,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -7951,7 +8041,7 @@ enum Command { CERTREQ("Generates.a.certificate.request", -@@ -2073,7 +2073,7 @@ +@@ -2100,7 +2100,7 @@ */ public static List<CRL> readCRLsFromCert(X509Certificate cert) throws Exception { @@ -7960,7 +8050,7 @@ CRLDistributionPointsExtension ext = X509CertImpl.toImpl(cert).getCRLDistributionPointsExtension(); if (ext == null) return crls; -@@ -2241,7 +2241,7 @@ +@@ -2268,7 +2268,7 @@ if (jarfile != null) { JarFile jf = new JarFile(jarfile, true); Enumeration<JarEntry> entries = jf.entries(); @@ -7969,7 +8059,7 @@ byte[] buffer = new byte[8192]; int pos = 0; while (entries.hasMoreElements()) { -@@ -3275,7 +3275,7 @@ +@@ -3316,7 +3316,7 @@ } // start building chain @@ -7978,7 +8068,7 @@ if (buildChain((X509Certificate)certToVerify, chain, certs)) { Certificate[] newChain = new Certificate[chain.size()]; // buildChain() returns chain with self-signed root-cert first and -@@ -3774,7 +3774,7 @@ +@@ -3815,7 +3815,7 @@ break; case 2: // EKU if(value != null) { @@ -7987,7 +8077,7 @@ for (String s: value.split(",")) { int p = oneOf(s, "anyExtendedKeyUsage", -@@ -3844,7 +3844,7 @@ +@@ -3885,7 +3885,7 @@ } if(value != null) { List<AccessDescription> accessDescriptions = @@ -7996,7 +8086,7 @@ String[] ps = value.split(","); for(String item: ps) { colonpos = item.indexOf(':'); -@@ -4080,7 +4080,7 @@ +@@ -4121,7 +4121,7 @@ } public static <A,B> Pair<A,B> of(A a, B b) { @@ -8006,8 +8096,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2016-07-28 16:23:18.300846601 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2016-11-11 07:02:18.832910131 +0000 @@ -645,7 +645,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -8045,8 +8135,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2016-11-11 07:02:18.832910131 +0000 @@ -49,13 +49,13 @@ */ public Set<String> decompose(String algorithm) { @@ -8064,8 +8154,8 @@ if (transTocken == null || transTocken.length() == 0) { continue; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java 2016-11-11 07:02:18.832910131 +0000 @@ -43,7 +43,7 @@ "jdk.tls.legacyAlgorithms"; @@ -8076,8 +8166,8 @@ private final String[] legacyAlgorithms; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2016-07-28 16:17:32.294457800 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2016-11-11 06:59:43.907440885 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2016-11-11 07:02:18.832910131 +0000 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -8088,8 +8178,8 @@ /** * Checks if a certificate is untrusted. 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2016-07-28 16:22:54.389234458 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2016-11-11 07:02:18.832910131 +0000 @@ -1251,7 +1251,7 @@ if (exts == null) { return null; @@ -8137,8 +8227,8 @@ namesCopy.add(Collections.unmodifiableList(nameEntryCopy)); } else { 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-11-11 07:02:18.832910131 +0000 @@ -350,7 +350,7 @@ if (extensions == null) { return null; @@ -8167,8 +8257,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-11-11 07:02:18.832910131 +0000 @@ -103,8 +103,8 @@ private X500Principal issuerPrincipal = null; private Date thisUpdate = null; @@ -8199,8 +8289,8 @@ if (!ex.isCritical()) { extSet.add(ex.getExtensionId().toString()); 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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2016-11-11 07:02:18.832910131 +0000 @@ -95,7 +95,7 @@ * Run the converter */ @@ -8211,8 +8301,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2016-11-11 07:02:18.832910131 +0000 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -8327,8 +8417,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2016-11-11 07:02:18.832910131 +0000 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -8384,8 +8474,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2016-11-11 07:02:18.832910131 +0000 @@ -81,7 +81,7 @@ } @@ -8413,8 +8503,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2016-11-11 07:02:18.832910131 +0000 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -8451,8 +8541,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2016-11-11 07:02:18.832910131 +0000 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -8472,8 +8562,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2016-11-11 07:02:18.832910131 +0000 @@ -187,7 +187,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -8493,8 +8583,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2016-11-11 07:02:18.832910131 +0000 @@ -160,7 +160,7 @@ } @@ -8529,8 +8619,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2016-11-11 07:02:18.832910131 +0000 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -8543,8 +8633,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2016-11-11 07:02:18.832910131 +0000 @@ -134,7 +134,7 @@ throws IOException { @@ -8555,8 +8645,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2016-11-11 07:02:18.836910065 +0000 @@ -157,7 +157,7 @@ @Override @@ -8657,8 +8747,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2016-11-11 07:02:18.836910065 +0000 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -8669,8 +8759,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2016-11-11 07:02:18.836910065 +0000 @@ -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. @@ -8681,8 +8771,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 2016-07-28 16:17:32.294457800 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2016-11-11 06:59:43.907440885 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2016-11-11 07:02:42.156529193 +0000 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -8747,8 +8837,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-11-11 07:02:18.836910065 +0000 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -8760,7 +8850,7 @@ BufferedReader in = @@ -209,7 +209,7 @@ // no local domain so try fallback (RPC) domain or - // hostname + // hostName - sl = new LinkedList<>(); + sl = new LinkedList<String>(); @@ -8768,8 +8858,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2016-11-11 07:02:18.836910065 +0000 @@ -43,10 +43,10 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController { @@ -8784,8 +8874,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2016-11-11 07:02:18.836910065 +0000 @@ -133,7 +133,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); @@ -8796,8 +8886,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2016-07-28 16:22:54.393234394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2016-11-11 07:02:18.836910065 +0000 @@ -136,7 +136,7 @@ // eventHigh needed when using file descriptors > 64k @@ -8808,8 +8898,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2016-11-11 07:02:18.836910065 +0000 @@ -67,7 +67,7 @@ fd1 = (int) pipeFds; pollWrapper = new EPollArrayWrapper(); @@ -8820,8 +8910,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2016-11-11 07:02:18.836910065 +0000 @@ -113,7 +113,7 @@ SocketAddress[] saa) { @@ -8832,8 +8922,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2016-11-11 07:02:18.836910065 +0000 @@ -153,12 +153,12 @@ static { @@ -8852,8 +8942,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2016-11-11 07:02:18.836910065 +0000 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -8873,8 +8963,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2016-11-11 07:02:18.836910065 +0000 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -8885,8 +8975,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2016-11-11 07:02:18.836910065 +0000 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -8897,8 +8987,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2016-11-11 07:02:18.836910065 +0000 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -8918,8 +9008,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2016-11-11 07:02:18.836910065 +0000 @@ -83,7 +83,7 @@ } @@ -8930,8 +9020,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2016-11-11 07:02:18.836910065 +0000 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -8942,8 +9032,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2016-11-11 07:02:18.836910065 +0000 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -8965,8 +9055,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-11-11 07:02:18.836910065 +0000 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -8977,8 +9067,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2016-11-11 07:02:18.836910065 +0000 @@ -128,7 +128,7 @@ } @@ -8989,8 +9079,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2016-11-11 07:02:18.836910065 +0000 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -9001,8 +9091,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2016-11-11 07:02:18.836910065 +0000 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -9013,8 +9103,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2016-11-11 07:02:18.836910065 +0000 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -9061,8 +9151,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2016-11-11 07:02:18.836910065 +0000 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -9073,8 +9163,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2016-11-11 07:02:18.836910065 +0000 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -9085,8 +9175,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2016-11-11 07:02:18.836910065 +0000 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -9097,8 +9187,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2016-11-11 07:02:18.836910065 +0000 @@ -103,7 +103,7 @@ } } @@ -9109,8 +9199,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2016-11-11 07:02:18.840909999 +0000 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -9121,8 +9211,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 2016-07-28 14:59:45.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2016-07-28 16:22:54.397234328 +0100 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2016-10-28 08:02:13.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2016-11-11 07:02:18.840909999 +0000 @@ -59,7 +59,7 @@ } } @@ -9132,15 +9222,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/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 2016-10-27 04:53:38.758268589 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java 2016-10-27 04:53:54.718000231 +0100 -@@ -1571,7 +1571,7 @@ - private void notifyUnsolicited(Object e) { - Vector<LdapCtx> unsolicitedCopy; - synchronized (unsolicited) { -- unsolicitedCopy = new Vector<>(unsolicited); -+ unsolicitedCopy = new Vector<LdapCtx>(unsolicited); - if (e instanceof NamingException) { - unsolicited.setSize(0); // no more listeners after exception - }
--- a/patches/boot/ecj-multicatch.patch Fri Nov 11 06:15:15 2016 +0000 +++ b/patches/boot/ecj-multicatch.patch Sat Nov 12 22:37:54 2016 +0000 @@ -949,3 +949,70 @@ throw new Exception(rb.getString("Input.not.an.X.509.certificate")); } +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 2016-11-11 07:37:30.734509907 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2016-11-11 07:39:05.881003919 +0000 +@@ -883,7 +883,8 @@ + InetAddress a1 = InetAddress.getByName(h1); + InetAddress a2 = InetAddress.getByName(h2); + result[0] = a1.equals(a2); +- } catch(UnknownHostException | SecurityException e) { ++ } catch(UnknownHostException e) { ++ } catch(SecurityException e) { + } + return null; + } +@@ -1650,8 +1651,9 @@ + // HttpsURLConnection instance saved in + // DelegateHttpsURLConnection + uconn = (URLConnection)this.getClass().getField("httpsURLConnection").get(this); +- } catch (IllegalAccessException | +- NoSuchFieldException e) { ++ } catch (IllegalAccessException e) { ++ // ignored; use 'this' ++ } catch (NoSuchFieldException e) { + // ignored; use 'this' + } + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java openjdk-boot/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java 2016-11-11 17:56:40.902084907 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java 2016-11-11 17:57:45.745028909 +0000 +@@ -85,10 +85,13 @@ + ClassLoader.getSystemClassLoader()); + provider = (HttpServerProvider)c.newInstance(); + return true; +- } catch (ClassNotFoundException | +- IllegalAccessException | +- InstantiationException | +- SecurityException x) { ++ } catch (ClassNotFoundException x) { ++ throw new ServiceConfigurationError(x); ++ } catch (IllegalAccessException x) { ++ throw new ServiceConfigurationError(x); ++ } catch (InstantiationException x) { ++ throw new ServiceConfigurationError(x); ++ } catch (SecurityException x) { + throw new ServiceConfigurationError(x); + } + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java openjdk-boot/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java 2016-11-11 18:31:26.771858815 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java 2016-11-11 18:33:20.217997543 +0000 +@@ -70,10 +70,13 @@ + Class<?> c = Class.forName(cm, true, null); + provider = (FtpClientProvider) c.newInstance(); + return true; +- } catch (ClassNotFoundException | +- IllegalAccessException | +- InstantiationException | +- SecurityException x) { ++ } catch (ClassNotFoundException x) { ++ throw new ServiceConfigurationError(x.toString()); ++ } catch (IllegalAccessException x) { ++ throw new ServiceConfigurationError(x.toString()); ++ } catch (InstantiationException x) { ++ throw new ServiceConfigurationError(x.toString()); ++ } catch (SecurityException x) { + throw new ServiceConfigurationError(x.toString()); + } + }