Mercurial > hg > release > icedtea7-2.6
changeset 2882:eb28ef741d14 icedtea-2.6.6
Bump to icedtea-2.6.6.
Upstream changes:
- Bump to icedtea-2.6.6
- PR2938: Fix build of 8148487 backport
- PR2939: Remove rogue ReleaseStringUTFChars line remaining from merge of 7u101 b00
- S4858370: JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
- S4963723: Implement SHA-224
- S6414899: P11Digest should support cloning
- S6956398: make ephemeral DH key match the length of the certificate key
- S7044060: Need to support NSA Suite B Cryptography algorithms
- S7127906: (launcher) convert the launcher regression tests to java
- S8002116: This JdbReadTwiceTest.sh gets an exit 1
- S8004007: test/sun/tools/jinfo/Basic.sh fails on when runSA is set to true
- S8006935: Need to take care of long secret keys in HMAC/PRF compuation
- S8007890: [TESTBUG] JcmdWithNMTDisabled.java fails when invoked with NMT explicitly turned on
- S8027705: com/sun/jdi/JdbMethodExitTest.sh fails when a background thread is generating events.
- S8028537: PPC64: Updated the JDK regression tests to run on AIX
- S8036132: Tab characters in test/com/sun/jdi files
- S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
- S8039921: SHA1WithDSA with key > 1024 bits not working
- S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
- S8059661: Test SoftReference and OOM behavior
- S8072753: Nondeterministic wrong answer on arithmetic
- S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME
- S8074146: [TEST_BUG] jdb has succeded to read an unreadable file
- S8081475: SystemTap does not work when JDK is compiled with GCC 5
- S8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
- S8129952: Ensure thread consistency
- S8132051: Better byte behavior
- S8134297: NPE in GSSNameElement nameType check
- S8134650: Xsl transformation gives different results in 8u66
- S8138593: Make DSA more fair
- S8139008: Better state table management
- S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c
- S8143002: [Parfait] JNI exception pending in fontpath.c:1300
- S8143167: Better buffering of XML strings
- S8144430: Improve JMX connections
- S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
- S8146494: Better ligature substitution
- S8146498: Better device table adjustments
- S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor
- S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051
- S8148446: (tz) Support tzdata2016a
- S8148475: Missing SA Bytecode updates.
- S8148487: PPC64: Better byte behavior
- S8149170: Better byte behavior for native arguments
- S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo
- S8150012: Better byte behavior for reflection
- S8150790: 8u75 L10n resource file translation update
- S8153673: [BACKOUT] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
- S8154210: Zero: Better byte behaviour
- S8154413: AArch64: Better byte behaviour
2016-04-21 Andrew John Hughes <gnu.andrew@member.fsf.org>
Bump to icedtea-2.6.6.
* Makefile.am,
(JDK_UPDATE_VERSION): Bump to 101.
(CORBA_CHANGESET): Update to icedtea-2.6.6.
(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.6.
* hotspot.map.in: Update to icedtea-2.6.6.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new case in
javax/management/remote/rmi/RMIJRMPServerImpl.java
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 22 Apr 2016 05:49:16 +0100 |
| parents | 56b5aa4739a2 |
| children | 00bafbd9a1cc |
| files | ChangeLog Makefile.am NEWS configure.ac hotspot.map.in patches/boot/ecj-diamond.patch |
| diffstat | 6 files changed, 795 insertions(+), 715 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 22 03:48:04 2016 +0100 +++ b/ChangeLog Fri Apr 22 05:49:16 2016 +0100 @@ -1,3 +1,27 @@ +2016-04-21 Andrew John Hughes <gnu.andrew@member.fsf.org> + + Bump to icedtea-2.6.6. + * Makefile.am, + (JDK_UPDATE_VERSION): Bump to 101. + (CORBA_CHANGESET): Update to icedtea-2.6.6. + (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.6. + * hotspot.map.in: Update to icedtea-2.6.6. + * patches/boot/ecj-diamond.patch: + Regenerated. Add new case in + javax/management/remote/rmi/RMIJRMPServerImpl.java + 2016-04-21 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2935: Check that freetype defines
--- a/Makefile.am Fri Apr 22 03:48:04 2016 +0100 +++ b/Makefile.am Fri Apr 22 05:49:16 2016 +0100 @@ -1,22 +1,22 @@ # Dependencies -JDK_UPDATE_VERSION = 99 +JDK_UPDATE_VERSION = 101 BUILD_VERSION = b00 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = bd2be90026f7 -JAXP_CHANGESET = 5ab0648fce58 -JAXWS_CHANGESET = 16ce6457a33a -JDK_CHANGESET = a4a37396e04b -LANGTOOLS_CHANGESET = 83f998d6c0af -OPENJDK_CHANGESET = b8b43305701a - -CORBA_SHA256SUM = 9c72e2b16f845759f3d27aaab4e1f2822e175bf2059d479aa726298408f3540e -JAXP_SHA256SUM = 8b60389217b2120d44be70800d0d040fb9aec7af8b60f5233011176c88b27826 -JAXWS_SHA256SUM = 45c806ae53732d5c632123d7bcfb7d3a7e7de791238ee9157646bdb2e3c86718 -JDK_SHA256SUM = 5659a4490d5bb725740f07715d791070e6690b8eef0247f585bee431582f7610 -LANGTOOLS_SHA256SUM = 5b1f263842eee44a0c6586718e9f0b7fdf9513fc57bf7eb4c779208f8bb59b74 -OPENJDK_SHA256SUM = 8a62724548c31ef5b74aaa1a0b8b315a99799f16245d3c16e534748f792676b1 +CORBA_CHANGESET = ca3e3c4c5a61 +JAXP_CHANGESET = 683427778edf +JAXWS_CHANGESET = 63f7bf7ed2d4 +JDK_CHANGESET = 55c38c1ace75 +LANGTOOLS_CHANGESET = e42dd50480d3 +OPENJDK_CHANGESET = 882cfee70fe8 + +CORBA_SHA256SUM = ce886c97a150465df3a36c4281d5f36ba8ee2b081b5b76ecfbefaddb723b6a2d +JAXP_SHA256SUM = 679eb46054afea3098713beee85639c4a5a5af881e94be527409feaea4272d30 +JAXWS_SHA256SUM = f9af138096f4d11e381c3cc949dd3ee37cee5bfff15dc21cff5c16a2f9e7c218 +JDK_SHA256SUM = 1baa92ca72db1b80fff18ca26bd49e5fd5f2927df9eceebf3456cbd86a710a9f +LANGTOOLS_SHA256SUM = 54bb2cee7b4fc5bbc63a4c9d7008602e12f75431c7f129ade7c405b53c2363f3 +OPENJDK_SHA256SUM = 24f813e6cb938272a4da37b46b48aa86820b13be0747747e6c8fb4aad72cadf3 DROP_URL = http://icedtea.classpath.org/download/drops
--- a/NEWS Fri Apr 22 03:48:04 2016 +0100 +++ b/NEWS Fri Apr 22 05:49:16 2016 +0100 @@ -12,12 +12,56 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.6.6 (2016-04-19): +New in release 2.6.6 (2016-04-21): +* Security fixes + - S8129952, CVE-2016-0686: Ensure thread consistency + - S8132051, CVE-2016-0687: Better byte behavior + - S8138593, CVE-2016-0695: Make DSA more fair + - S8139008: Better state table management + - S8143167, CVE-2016-3425: Better buffering of XML strings + - S8144430, CVE-2016-3427: Improve JMX connections + - S8146494: Better ligature substitution + - S8146498: Better device table adjustments +* Import of OpenJDK 7 u101 build 0 + - S4858370: JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command + - S7127906: (launcher) convert the launcher regression tests to java + - S8002116: This JdbReadTwiceTest.sh gets an exit 1 + - S8004007: test/sun/tools/jinfo/Basic.sh fails on when runSA is set to true + - S8007890: [TESTBUG] JcmdWithNMTDisabled.java fails when invoked with NMT explicitly turned on + - S8027705: com/sun/jdi/JdbMethodExitTest.sh fails when a background thread is generating events. + - S8028537: PPC64: Updated the JDK regression tests to run on AIX + - S8036132: Tab characters in test/com/sun/jdi files + - S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes + - S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root + - S8059661: Test SoftReference and OOM behavior + - S8072753: Nondeterministic wrong answer on arithmetic + - S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME + - S8074146: [TEST_BUG] jdb has succeded to read an unreadable file + - S8134297: NPE in GSSNameElement nameType check + - S8134650: Xsl transformation gives different results in 8u66 + - S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c + - S8143002: [Parfait] JNI exception pending in fontpath.c:1300 + - S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again + - S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor + - S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051 + - S8148446: (tz) Support tzdata2016a + - S8148475: Missing SA Bytecode updates. + - S8149170: Better byte behavior for native arguments + - S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo + - S8150012: Better byte behavior for reflection + - S8150790: 8u75 L10n resource file translation update + - S8153673: [BACKOUT] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command + - S8154210: Zero: Better byte behaviour +* Backports + - S8148487: PPC64: Better byte behavior + - S8154413: AArch64: Better byte behaviour * Bug fixes - PR2889: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) - PR2929: configure: error: "A JDK home directory could not be found." - PR2935: Check that freetype defines FT_CONFIG_OPTION_INFINALITY_PATCHSET if enabling infinality + - PR2938: Fix build of 8148487 backport + - PR2939: Remove rogue ReleaseStringUTFChars line remaining from merge of 7u101 b00 * AArch64 port - PR2914: byte_map_base is not page aligned on OpenJDK 7 * JamVM
--- a/configure.ac Fri Apr 22 03:48:04 2016 +0100 +++ b/configure.ac Fri Apr 22 05:49:16 2016 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.6pre01], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.6.6], [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 Apr 22 03:48:04 2016 +0100 +++ b/hotspot.map.in Fri Apr 22 05:49:16 2016 +0100 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 825fa447453a a75da544a79cc8bf288a76cc96da82702ac269bfb5208fdd9b7718d984aa5b1e +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 3022a3d80efd a4e8f4fef724a34e5eece3c2c1de4e60ff12e752549c8df11ddcd6f3042e0dc2
--- a/patches/boot/ecj-diamond.patch Fri Apr 22 03:48:04 2016 +0100 +++ b/patches/boot/ecj-diamond.patch Fri Apr 22 05:49:16 2016 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-01-18 15:52:10.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-04-18 06:49:20.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-04-22 04:41:51.693514130 +0100 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/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-01-18 15:52:10.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-04-18 06:49:20.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-04-22 04:41:51.693514130 +0100 @@ -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-01-18 15:52:10.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-04-18 06:49:20.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-04-22 04:41:51.693514130 +0100 @@ -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-01-18 15:52:10.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-04-18 06:49:20.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-04-22 04:41:51.693514130 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-04-22 04:41:51.693514130 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-04-22 04:41:51.693514130 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-04-22 04:41:51.693514130 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-01-20 01:43:32.528245741 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-04-22 04:41:51.693514130 +0100 @@ -139,7 +139,7 @@ private boolean _isStatic = false; @@ -225,18 +225,18 @@ // 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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-01-20 01:43:32.528245741 +0000 -@@ -106,7 +106,7 @@ - - // Check if we have any declared namesaces +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-04-22 04:44:46.770697237 +0100 +@@ -107,7 +107,7 @@ + + // Check if we have any declared namespaces if (_accessedPrefixes == null) { -- _accessedPrefixes = new HashMap<>(); -+ _accessedPrefixes = new HashMap<String,String>(); +- _accessedPrefixes = new Hashtable<>(); ++ _accessedPrefixes = new Hashtable<String,String>(); } else { if (!declared) { -@@ -168,7 +168,7 @@ +@@ -169,7 +169,7 @@ */ public void addAttribute(SyntaxTreeNode attribute) { if (_attributeElements == null) { @@ -245,7 +245,7 @@ } _attributeElements.add(attribute); } -@@ -178,7 +178,7 @@ +@@ -179,7 +179,7 @@ */ public void setFirstAttribute(SyntaxTreeNode attribute) { if (_attributeElements == null) { @@ -254,7 +254,7 @@ } _attributeElements.add(0, attribute); } -@@ -204,7 +204,7 @@ +@@ -205,7 +205,7 @@ * to _ANY_ namespace URI. Used by literal result elements to determine */ public Set<Map.Entry<String, String>> getNamespaceScope(SyntaxTreeNode node) { @@ -263,7 +263,7 @@ while (node != null) { Map<String, String> mapping = node.getPrefixMapping(); -@@ -444,7 +444,7 @@ +@@ -445,7 +445,7 @@ } else if (node instanceof XslAttribute) { if (attrsTable == null) { @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-01-20 01:43:32.532245674 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2016-04-22 04:41:51.697514066 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2016-01-20 01:43:32.536245607 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java 2016-04-22 04:41:51.701514002 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2016-01-20 01:43:32.540245541 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java 2016-04-22 04:41:51.705513938 +0100 @@ -294,7 +294,7 @@ // REVISIT: do well-formedness issues involving XML declaration <?xml ... ?> need to be added to hash table (no XML declaration node in DOM, but Document includes xmlEncoding, xmlStandalone, xmlVersion, etc. @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2016-04-22 04:41:51.705513938 +0100 @@ -142,7 +142,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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2016-01-20 01:43:32.544245472 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-20 01:42:33.577237467 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2016-04-22 04:39:36.783674297 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2016-04-22 04:41:51.705513938 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 15:52:13.000000000 +0000 -+++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2016-04-18 06:49:21.000000000 +0100 ++++ openjdk-boot/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2016-04-22 04:41:51.709513874 +0100 @@ -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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2016-04-22 04:41:51.709513874 +0100 @@ -45,7 +45,7 @@ private final Kind keyKind; // a reference kind for the cache keys private final Kind valueKind; // a reference kind for the cache values @@ -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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2016-01-20 01:43:32.548245405 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2016-04-22 04:41:51.709513874 +0100 @@ -104,9 +104,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-01-20 01:42:38.157160414 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2016-04-22 04:39:36.831673530 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2016-04-22 04:41:51.709513874 +0100 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -1831,8 +1831,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-01-20 01:42:08.029667291 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2016-04-22 04:39:36.743674937 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2016-04-22 04:41:51.709513874 +0100 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -1843,8 +1843,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2016-04-22 04:41:51.709513874 +0100 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -1881,8 +1881,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2016-04-22 04:41:51.709513874 +0100 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -1893,8 +1893,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2016-04-22 04:41:51.709513874 +0100 @@ -921,7 +921,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -1923,8 +1923,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-01-20 01:42:38.969146752 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2016-04-22 04:39:36.831673530 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2016-04-22 04:41:51.709513874 +0100 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -1962,8 +1962,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2016-04-22 04:41:51.709513874 +0100 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -1974,8 +1974,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/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-01-20 01:42:15.069548847 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2016-04-22 04:39:36.743674937 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2016-04-22 04:41:51.713513810 +0100 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -2131,8 +2131,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-01-20 01:42:39.569136659 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2016-04-22 04:39:36.831673530 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2016-04-22 04:41:51.713513810 +0100 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -2246,8 +2246,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-01-20 01:42:39.569136659 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2016-04-22 04:39:36.831673530 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2016-04-22 04:41:51.713513810 +0100 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -2303,8 +2303,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2016-01-20 01:43:32.552245339 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2016-04-22 04:41:51.713513810 +0100 @@ -183,8 +183,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -2335,8 +2335,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2016-04-22 04:41:51.713513810 +0100 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -2347,8 +2347,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-01-20 01:42:39.569136659 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2016-04-22 04:39:36.831673530 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2016-04-22 04:41:51.713513810 +0100 @@ -48,8 +48,8 @@ */ @@ -2379,8 +2379,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2016-04-22 04:41:51.713513810 +0100 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -2401,8 +2401,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-01-20 01:42:39.569136659 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2016-04-22 04:39:36.831673530 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2016-04-22 04:41:51.713513810 +0100 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -2413,8 +2413,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-01-20 01:42:39.573136592 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2016-04-22 04:39:36.835673466 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2016-04-22 04:41:51.713513810 +0100 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -2425,8 +2425,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2016-04-22 04:41:51.713513810 +0100 @@ -56,7 +56,7 @@ // principal in the delegated subject // @@ -2437,8 +2437,8 @@ final String pname = p.getClass().getName() + "." + p.getName(); permissions.add(new SubjectDelegationPermission(pname)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2016-04-22 04:41:51.713513810 +0100 @@ -54,7 +54,7 @@ * Contains event dispatcher per thread group. */ @@ -2449,8 +2449,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2016-04-22 04:41:51.713513810 +0100 @@ -102,7 +102,7 @@ && !SoundbankReader.class.equals(serviceClass) && !MidiFileWriter.class.equals(serviceClass) @@ -2461,8 +2461,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2016-04-22 04:41:51.713513810 +0100 @@ -59,7 +59,7 @@ * dispatcher instance with a factory in EventDispatcher */ @@ -2473,8 +2473,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2016-04-22 04:41:51.713513810 +0100 @@ -231,7 +231,7 @@ * Create an empty ExecOptionPermissionCollection. */ @@ -2485,8 +2485,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2016-04-22 04:41:51.713513810 +0100 @@ -235,7 +235,7 @@ * Create an empty ExecPermissionCollection. */ @@ -2497,8 +2497,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2016-01-20 01:43:32.556245270 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2016-04-22 04:41:51.717513746 +0100 @@ -1285,7 +1285,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -2518,8 +2518,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2016-04-22 04:41:51.717513746 +0100 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -2530,8 +2530,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2016-04-22 04:41:51.717513746 +0100 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -2546,8 +2546,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2016-04-22 04:41:51.717513746 +0100 @@ -152,7 +152,7 @@ // new configuration @@ -2576,8 +2576,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2016-04-22 04:41:51.721513683 +0100 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -2588,8 +2588,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2016-04-22 04:41:51.721513683 +0100 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -2600,8 +2600,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2016-04-22 04:41:51.721513683 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -2612,8 +2612,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2016-04-22 04:41:51.721513683 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -2624,8 +2624,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2016-04-22 04:41:51.721513683 +0100 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -2636,8 +2636,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2016-04-22 04:41:51.721513683 +0100 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -2648,8 +2648,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2016-04-22 04:41:51.721513683 +0100 @@ -97,7 +97,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -2678,8 +2678,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2016-04-22 04:41:51.721513683 +0100 @@ -44,7 +44,7 @@ } else { @@ -2699,8 +2699,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2016-04-22 04:41:51.721513683 +0100 @@ -96,7 +96,7 @@ BeanInfo putBeanInfo(Class<?> type, BeanInfo info) { @@ -2711,8 +2711,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2016-04-22 04:41:51.721513683 +0100 @@ -34,7 +34,7 @@ */ @@ -2732,8 +2732,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2016-01-20 01:43:32.560245203 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2016-04-22 04:41:51.721513683 +0100 @@ -61,7 +61,7 @@ private volatile boolean closed = false; @@ -2744,8 +2744,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2016-04-22 04:41:51.721513683 +0100 @@ -1150,7 +1150,7 @@ if ((names == null) || (filter == null)) { return names; @@ -2774,8 +2774,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2016-04-22 04:41:51.721513683 +0100 @@ -76,7 +76,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -2786,8 +2786,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2016-04-22 04:41:51.721513683 +0100 @@ -725,7 +725,7 @@ */ @@ -2816,9 +2816,9 @@ } } 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2016-01-20 01:43:32.564245137 +0000 -@@ -214,7 +214,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2016-04-22 04:41:51.721513683 +0100 +@@ -217,7 +217,7 @@ /** table mapping primitive type names to corresponding class objects */ private static final HashMap<String, Class<?>> primClasses @@ -2827,7 +2827,7 @@ static { primClasses.put("boolean", boolean.class); primClasses.put("byte", byte.class); -@@ -230,11 +230,11 @@ +@@ -233,11 +233,11 @@ private static class Caches { /** cache of subclass security audit results */ static final ConcurrentMap<WeakClassKey,Boolean> subclassAudits = @@ -2842,8 +2842,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2016-04-22 04:41:51.721513683 +0100 @@ -166,11 +166,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -2868,8 +2868,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2016-04-22 04:41:51.721513683 +0100 @@ -87,18 +87,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -2959,8 +2959,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2016-04-22 04:41:51.725513617 +0100 @@ -47,7 +47,7 @@ } } @@ -2971,8 +2971,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2016-04-22 04:41:51.725513617 +0100 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -2993,8 +2993,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2016-01-20 01:43:32.564245137 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2016-04-22 04:41:51.725513617 +0100 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -3005,8 +3005,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2016-04-22 04:41:51.725513617 +0100 @@ -1359,7 +1359,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -3059,8 +3059,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2016-04-22 04:41:51.725513617 +0100 @@ -248,7 +248,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -3101,7 +3101,7 @@ assertionLock = this; } } -@@ -1184,7 +1185,7 @@ +@@ -1187,7 +1188,7 @@ } tmp[1] = findResources(name); @@ -3110,7 +3110,7 @@ } /** -@@ -1683,7 +1684,7 @@ +@@ -1686,7 +1687,7 @@ protected Package[] getPackages() { Map<String, Package> map; synchronized (packages) { @@ -3119,7 +3119,7 @@ } Package[] pkgs; if (parent != null) { -@@ -1790,17 +1791,20 @@ +@@ -1793,17 +1794,20 @@ } // All native library names we've loaded. @@ -3144,7 +3144,7 @@ // The paths searched for libraries private static String usr_paths[]; -@@ -2134,8 +2138,8 @@ +@@ -2137,8 +2141,8 @@ * them to empty maps, effectively ignoring any present settings. */ synchronized (assertionLock) { @@ -3155,7 +3155,7 @@ defaultAssertionStatus = false; } } -@@ -2197,8 +2201,8 @@ +@@ -2200,8 +2204,8 @@ private void initializeJavaAssertionMaps() { // assert Thread.holdsLock(assertionLock); @@ -3167,8 +3167,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2016-04-22 04:41:51.725513617 +0100 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -3210,8 +3210,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-01-20 01:42:40.761116606 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2016-04-22 04:39:36.899672441 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2016-04-22 04:41:51.725513617 +0100 @@ -393,7 +393,7 @@ } private boolean isPlaceholder() { return clazz == null; } @@ -3222,8 +3222,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2016-04-22 04:41:51.725513617 +0100 @@ -290,7 +290,7 @@ if (UNSAFE.shouldBeInitialized(type)) // If the previous call didn't block, this can happen. @@ -3234,8 +3234,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-01-20 01:42:40.825115529 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2016-04-22 04:39:36.899672441 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2016-04-22 04:41:51.725513617 +0100 @@ -129,7 +129,7 @@ static { @@ -3255,8 +3255,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-01-20 01:42:40.909114115 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2016-04-22 04:39:36.899672441 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2016-04-22 04:41:51.725513617 +0100 @@ -468,12 +468,12 @@ int capacity = 512; // expect many distinct signatures over time float loadFactor = 0.75f; // normal default @@ -3273,8 +3273,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-04-22 04:39:36.799674042 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-04-22 04:41:51.725513617 +0100 @@ -808,14 +808,14 @@ // JVM returned to us with an intentional overflow! totalCount += buf.length; @@ -3293,8 +3293,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-01-20 01:42:41.181109540 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2016-04-22 04:39:36.899672441 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2016-04-22 04:41:51.729513553 +0100 @@ -73,8 +73,8 @@ static final class ArrayAccessor { @@ -3316,8 +3316,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2016-04-22 04:41:51.729513553 +0100 @@ -834,7 +834,7 @@ } } @@ -3328,8 +3328,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2016-01-20 01:43:32.568245068 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2016-04-22 04:41:51.729513553 +0100 @@ -1950,7 +1950,7 @@ int inargs = outargs + dropped; if (pos < 0 || pos >= inargs) @@ -3340,8 +3340,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2016-04-22 04:41:51.729513553 +0100 @@ -1048,7 +1048,7 @@ private final float loadFactor; @@ -3352,8 +3352,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-01-20 01:42:35.189210347 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2016-04-22 04:39:36.787674234 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2016-04-22 04:41:51.729513553 +0100 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -3364,8 +3364,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2016-04-22 04:41:51.729513553 +0100 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -3403,8 +3403,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-01-20 01:42:39.573136592 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2016-04-22 04:39:36.835673466 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2016-04-22 04:41:51.729513553 +0100 @@ -599,13 +599,16 @@ } @@ -3426,8 +3426,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-01-20 01:42:35.189210347 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2016-04-22 04:39:36.787674234 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2016-04-22 04:41:51.729513553 +0100 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -3447,8 +3447,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2016-04-22 04:41:51.729513553 +0100 @@ -137,7 +137,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -3459,8 +3459,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-01-20 01:42:35.189210347 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2016-04-22 04:39:36.787674234 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2016-04-22 04:41:51.729513553 +0100 @@ -234,7 +234,7 @@ * a cache of proxy classes */ @@ -3480,8 +3480,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2016-04-22 04:41:51.729513553 +0100 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -3492,8 +3492,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2016-04-22 04:41:51.729513553 +0100 @@ -71,12 +71,12 @@ } @@ -3547,8 +3547,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2016-04-22 04:41:51.729513553 +0100 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -3562,8 +3562,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2016-04-22 04:41:51.729513553 +0100 @@ -2282,7 +2282,7 @@ int off = 0; int next = 0; @@ -3574,8 +3574,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2016-04-22 04:41:51.729513553 +0100 @@ -1638,7 +1638,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -3601,8 +3601,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2016-01-20 01:43:32.572245001 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2016-04-22 04:41:51.729513553 +0100 @@ -918,7 +918,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -3622,8 +3622,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2016-04-22 04:41:51.729513553 +0100 @@ -733,7 +733,7 @@ static InetAddressImpl impl; @@ -3643,8 +3643,8 @@ for (String key : cache.keySet()) { CacheEntry entry = cache.get(key); 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2016-04-22 04:41:51.733513489 +0100 @@ -205,7 +205,7 @@ */ @@ -3655,8 +3655,8 @@ /** * Returns an input stream for reading the specified resource. 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-01-20 01:42:39.573136592 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2016-04-22 04:39:36.835673466 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2016-04-22 04:41:51.733513489 +0100 @@ -1504,7 +1504,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -3676,8 +3676,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2016-04-22 04:41:51.733513489 +0100 @@ -136,7 +136,7 @@ this.context = null; } @@ -3688,8 +3688,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2016-04-22 04:41:51.733513489 +0100 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -3700,8 +3700,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2016-04-22 04:41:51.733513489 +0100 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -3725,8 +3725,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2016-04-22 04:41:51.733513489 +0100 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -3746,8 +3746,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2016-04-22 04:41:51.733513489 +0100 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -3767,8 +3767,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2016-04-22 04:41:51.733513489 +0100 @@ -401,8 +401,8 @@ int swag = 32; int vcap = 8; @@ -3781,8 +3781,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2016-04-22 04:41:51.733513489 +0100 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -3811,8 +3811,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2016-04-22 04:41:51.733513489 +0100 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -3823,8 +3823,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2016-04-22 04:41:51.733513489 +0100 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -3871,8 +3871,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2016-04-22 04:41:51.733513489 +0100 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -3910,8 +3910,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2016-04-22 04:41:51.733513489 +0100 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -3922,8 +3922,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2016-01-20 01:43:32.576244935 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2016-04-22 04:41:51.733513489 +0100 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -3953,8 +3953,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2016-04-22 04:41:51.733513489 +0100 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -3965,8 +3965,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2016-04-22 04:41:51.737513425 +0100 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -4592,8 +4592,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-01-20 01:42:39.573136592 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2016-04-22 04:39:36.835673466 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2016-04-22 04:41:51.737513425 +0100 @@ -101,7 +101,7 @@ // class data: instance map @@ -4604,8 +4604,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2016-04-22 04:41:51.737513425 +0100 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -4616,8 +4616,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2016-04-22 04:41:51.737513425 +0100 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -4640,8 +4640,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-01-20 01:42:35.589203616 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2016-04-22 04:39:36.787674234 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2016-04-22 04:41:51.737513425 +0100 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -4652,8 +4652,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2016-04-22 04:41:51.737513425 +0100 @@ -894,7 +894,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -4664,8 +4664,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2016-04-22 04:41:51.737513425 +0100 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -4712,8 +4712,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2016-01-20 01:43:32.580244867 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2016-04-22 04:41:51.737513425 +0100 @@ -538,7 +538,7 @@ // Creates the new entry. @@ -4769,8 +4769,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2016-04-22 04:41:51.737513425 +0100 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -4790,8 +4790,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2016-04-22 04:41:51.737513425 +0100 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -4802,8 +4802,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2016-04-22 04:41:51.737513425 +0100 @@ -238,7 +238,7 @@ */ @Override @@ -4823,8 +4823,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2016-04-22 04:41:51.737513425 +0100 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -4862,8 +4862,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2016-04-22 04:41:51.737513425 +0100 @@ -187,7 +187,7 @@ return; @@ -4874,8 +4874,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2016-04-22 04:41:51.737513425 +0100 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -4886,8 +4886,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2016-04-22 04:41:51.737513425 +0100 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -4898,8 +4898,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2016-04-22 04:41:51.741513361 +0100 @@ -518,8 +518,8 @@ // were final, the following KnownLevel implementation can be removed. // Future API change should take this into consideration. @@ -4929,8 +4929,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2016-04-22 04:41:51.741513361 +0100 @@ -177,7 +177,7 @@ private volatile LogManager manager; private String name; @@ -4950,8 +4950,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2016-04-22 04:41:51.741513361 +0100 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -4962,8 +4962,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2016-04-22 04:41:51.741513361 +0100 @@ -389,7 +389,7 @@ // find the AppContext of the applet code // will be null if we are in the main app context. @@ -5019,8 +5019,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2016-04-22 04:41:51.741513361 +0100 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -5032,8 +5032,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2016-04-22 04:41:51.741513361 +0100 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -5064,8 +5064,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2016-01-20 01:43:32.584244799 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2016-04-22 04:41:51.741513361 +0100 @@ -538,7 +538,7 @@ cursor--; else { @@ -5076,8 +5076,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2016-04-22 04:41:51.741513361 +0100 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -5088,8 +5088,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2016-04-22 04:41:51.741513361 +0100 @@ -321,7 +321,7 @@ * <td headers="matches">Nothing, but quotes all characters until <tt>\E</tt></td></tr> * <tr><td valign="top" headers="construct quot"><tt>\E</tt></td> @@ -5127,8 +5127,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2016-04-22 04:41:51.741513361 +0100 @@ -193,8 +193,8 @@ } }; @@ -5141,8 +5141,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2016-04-22 04:41:51.741513361 +0100 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -5153,8 +5153,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2016-04-22 04:41:51.741513361 +0100 @@ -291,7 +291,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -5219,8 +5219,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2016-04-22 04:41:51.741513361 +0100 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -5249,8 +5249,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2016-04-22 04:41:51.745513297 +0100 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -5261,8 +5261,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2016-04-22 04:41:51.745513297 +0100 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -5318,8 +5318,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2016-04-22 04:41:51.745513297 +0100 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -5387,8 +5387,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2016-04-22 04:41:51.745513297 +0100 @@ -172,7 +172,7 @@ /** * Reference queue for cleared WeakEntries @@ -5421,8 +5421,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2016-04-22 04:41:51.745513297 +0100 @@ -321,7 +321,7 @@ // the outstanding inputstreams that need to be closed, @@ -5451,8 +5451,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2016-01-20 01:43:32.588244732 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2016-04-22 04:41:51.745513297 +0100 @@ -53,8 +53,8 @@ } @@ -5465,8 +5465,8 @@ private long written = 0; private long locoff = 0; 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2016-04-22 04:41:51.745513297 +0100 @@ -84,7 +84,7 @@ * no CryptoPermissionCollections. */ @@ -5505,8 +5505,8 @@ fields.put("perms", permTable); s.writeFields(); 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2016-04-22 04:41:51.745513297 +0100 @@ -54,7 +54,7 @@ private static final CryptoAllPermission allPerm; private static final Vector TrustedCallersCache = new Vector(2); @@ -5516,9 +5516,21 @@ private static final CryptoPermissions CACHE_NULL_MARK = 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-04-22 04:48:04.019515179 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java 2016-04-22 04:48:19.499265223 +0100 +@@ -103,7 +103,7 @@ + = (String[]) this.env.get(EnvHelp.CREDENTIAL_TYPES); + List<String> types = null; + if (credentialsTypes != null) { +- types = new ArrayList<>(); ++ types = new ArrayList<String>(); + for (String type : credentialsTypes) { + 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2016-04-22 04:41:51.745513297 +0100 @@ -116,7 +116,7 @@ return null; } @@ -5529,8 +5541,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2016-04-22 04:41:51.745513297 +0100 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -5541,8 +5553,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2016-04-22 04:41:51.745513297 +0100 @@ -590,7 +590,7 @@ // Don't call out.defaultWriteObject() @@ -5553,8 +5565,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2016-04-22 04:41:51.745513297 +0100 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -5565,8 +5577,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2016-04-22 04:41:51.745513297 +0100 @@ -48,7 +48,7 @@ private Subject subject; @@ -5577,8 +5589,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2016-04-22 04:41:51.745513297 +0100 @@ -267,7 +267,7 @@ private static Collection<JInternalFrame> getAllFrames(Container parent) { @@ -5589,8 +5601,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2016-04-22 04:41:51.745513297 +0100 @@ -58,7 +58,7 @@ public class Sockets { @@ -5637,8 +5649,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2016-04-22 04:41:51.745513297 +0100 @@ -109,7 +109,7 @@ * Note that this only applies to createFont() from an InputStream object. */ @@ -5649,8 +5661,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-01-20 01:42:41.181109540 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2016-04-22 04:39:36.903672377 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2016-04-22 04:41:51.745513297 +0100 @@ -60,7 +60,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap<?,?>[n]; @@ -5688,8 +5700,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2016-04-22 04:41:51.745513297 +0100 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -5700,8 +5712,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2016-04-22 04:41:51.745513297 +0100 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -5712,8 +5724,8 @@ return c; } 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-01-20 01:42:39.577136524 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2016-04-22 04:39:36.835673466 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2016-04-22 04:41:51.749513233 +0100 @@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -5751,8 +5763,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2016-04-22 04:41:51.749513233 +0100 @@ -120,7 +120,7 @@ String key = null, value = null; @@ -5763,8 +5775,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2016-04-22 04:41:51.749513233 +0100 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -5775,8 +5787,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2016-04-22 04:41:51.749513233 +0100 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -5805,8 +5817,8 @@ // do the query 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2016-01-20 01:43:32.592244666 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2016-04-22 04:41:51.749513233 +0100 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -5817,8 +5829,8 @@ /* 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2016-04-22 04:41:51.749513233 +0100 @@ -2660,7 +2660,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -5838,8 +5850,8 @@ String fVal = filterHeaderField(key, value); if (fVal != null) 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2016-04-22 04:41:51.749513233 +0100 @@ -239,7 +239,7 @@ url = null; } @@ -5850,8 +5862,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2016-04-22 04:41:51.749513233 +0100 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -5889,8 +5901,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2016-04-22 04:41:51.749513233 +0100 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -5901,8 +5913,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2016-04-22 04:41:51.749513233 +0100 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -5915,8 +5927,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2016-04-22 04:41:51.749513233 +0100 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -5927,8 +5939,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2016-04-22 04:41:51.749513233 +0100 @@ -77,7 +77,7 @@ throws IOException { @@ -5948,8 +5960,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2016-04-22 04:41:51.749513233 +0100 @@ -71,7 +71,7 @@ @Override @@ -5960,8 +5972,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2016-04-22 04:41:51.749513233 +0100 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -5981,8 +5993,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-01-20 01:42:15.073548778 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2016-01-20 01:43:32.632243993 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2016-04-22 04:39:36.743674937 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2016-04-22 04:41:51.749513233 +0100 @@ -442,7 +442,7 @@ Map<String, Class<?>> memberTypes = annotationType.memberTypes(); @@ -5993,8 +6005,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2016-04-22 04:41:51.749513233 +0100 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -6059,8 +6071,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2016-04-22 04:41:51.749513233 +0100 @@ -78,9 +78,9 @@ /* indicate compatibility with JDK 1.1.x version of class */ private static final long serialVersionUID = 4666870661827494597L; @@ -6074,8 +6086,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2016-04-22 04:41:51.749513233 +0100 @@ -160,7 +160,7 @@ } @@ -6086,8 +6098,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2016-04-22 04:41:51.749513233 +0100 @@ -184,7 +184,7 @@ destDir = null; flags = F_WARNINGS; @@ -6107,8 +6119,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2016-04-22 04:41:51.749513233 +0100 @@ -61,7 +61,7 @@ */ public class RMIGenerator implements RMIConstants, Generator { @@ -6128,8 +6140,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-01-20 01:42:36.297191705 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2016-01-20 01:43:32.596244598 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2016-04-22 04:39:36.791674170 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2016-04-22 04:41:51.749513233 +0100 @@ -66,10 +66,10 @@ /** maps persistent IDs to activated remote objects */ @@ -6144,8 +6156,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-01-20 01:42:39.581136457 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2016-04-22 04:39:36.839673402 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2016-04-22 04:41:51.753513169 +0100 @@ -149,10 +149,10 @@ /** maps activation id to its respective group id */ @@ -6202,8 +6214,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-01-20 01:42:36.497188341 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2016-04-22 04:39:36.791674170 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2016-04-22 04:41:51.753513169 +0100 @@ -113,11 +113,11 @@ * garbage collected. */ @@ -6228,9 +6240,9 @@ /** * 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2016-01-20 01:43:32.600244530 +0000 -@@ -71,14 +71,14 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2016-04-22 04:41:51.753513169 +0100 +@@ -76,14 +76,14 @@ /** table to hold sun classes to which access is explicitly permitted */ protected static Map<String, Class<?>> permittedSunClasses @@ -6248,9 +6260,9 @@ /** * if true, load classes (if not available locally) only from the diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2016-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2016-01-20 01:43:32.600244530 +0000 -@@ -537,7 +537,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2016-04-22 04:41:51.757513106 +0100 +@@ -538,7 +538,7 @@ HashToMethod_Maps() {} protected Map<Long,Method> computeValue(Class<?> remoteClass) { @@ -6260,8 +6272,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2016-04-22 04:41:51.757513106 +0100 @@ -207,7 +207,7 @@ * @throws NullPointerException if remoteClass is null */ @@ -6272,8 +6284,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2016-04-22 04:41:51.757513106 +0100 @@ -46,7 +46,7 @@ **/ public abstract class WeakClassHashMap<V> { @@ -6284,8 +6296,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2016-04-22 04:41:51.757513106 +0100 @@ -43,7 +43,7 @@ private boolean dgcAckNeeded = false; @@ -6296,8 +6308,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2016-04-22 04:41:51.757513106 +0100 @@ -78,7 +78,7 @@ Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>()); @@ -6308,8 +6320,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2016-04-22 04:41:51.757513106 +0100 @@ -193,9 +193,9 @@ private DGC dgc; @@ -6381,8 +6393,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2016-04-22 04:41:51.757513106 +0100 @@ -88,7 +88,7 @@ /** remote implementation of DGC interface for this VM */ private static DGCImpl dgc; @@ -6411,8 +6423,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2016-04-22 04:41:51.757513106 +0100 @@ -62,9 +62,9 @@ /** tables mapping to Target, keyed from ObjectEndpoint and impl object */ @@ -6435,8 +6447,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2016-04-22 04:41:51.757513106 +0100 @@ -116,7 +116,7 @@ /* construct table mapping command strings to handlers */ private static Hashtable<String, CGICommandHandler> commandLookup; @@ -6447,8 +6459,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-01-20 01:42:39.581136457 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2016-04-22 04:39:36.839673402 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2016-04-22 04:41:51.757513106 +0100 @@ -75,13 +75,13 @@ /** table of hosts successfully connected to and the factory used */ @@ -6475,8 +6487,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2016-01-20 01:43:32.600244530 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2016-04-22 04:41:51.757513106 +0100 @@ -53,10 +53,10 @@ /** stub for remote object */ private final Remote stub; @@ -6491,8 +6503,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2016-04-22 04:41:51.757513106 +0100 @@ -85,7 +85,7 @@ private DataOutputStream dataOut; @@ -6503,8 +6515,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2016-04-22 04:41:51.757513106 +0100 @@ -64,7 +64,7 @@ private final TCPTransport tr; /** list of cached connections */ @@ -6524,8 +6536,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-01-20 01:42:36.697184976 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2016-04-22 04:39:36.791674170 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2016-04-22 04:41:51.757513106 +0100 @@ -148,7 +148,7 @@ // TBD: should this be a weak hash table? private static final @@ -6536,8 +6548,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2016-04-22 04:41:51.757513106 +0100 @@ -123,7 +123,7 @@ /** client host for the current thread's connection */ @@ -6557,8 +6569,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2016-04-22 04:41:51.757513106 +0100 @@ -66,7 +66,7 @@ Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel); @@ -6569,8 +6581,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2016-04-22 04:41:51.757513106 +0100 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -6581,8 +6593,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2016-04-22 04:41:51.757513106 +0100 @@ -41,15 +41,15 @@ // or principal. // @@ -6623,8 +6635,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2016-04-22 04:41:51.757513106 +0100 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -6644,8 +6656,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2016-04-22 04:41:51.757513106 +0100 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -6683,8 +6695,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2016-04-22 04:41:51.757513106 +0100 @@ -40,7 +40,7 @@ public class Providers { @@ -6695,8 +6707,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2016-04-22 04:41:51.757513106 +0100 @@ -251,7 +251,7 @@ } @@ -6707,8 +6719,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-01-20 01:42:15.073548778 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2016-04-22 04:39:36.747674873 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2016-04-22 04:41:51.757513106 +0100 @@ -602,7 +602,7 @@ } }))); @@ -6786,8 +6798,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2016-04-22 04:41:51.757513106 +0100 @@ -173,7 +173,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -6798,8 +6810,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2016-04-22 04:41:51.757513106 +0100 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -6810,8 +6822,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-01-20 01:42:39.581136457 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2016-04-22 04:39:36.839673402 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2016-04-22 04:41:51.757513106 +0100 @@ -569,7 +569,7 @@ private static String exec(String c) { @@ -6822,8 +6834,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2016-01-20 01:43:32.604244464 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2016-04-22 04:41:51.761513040 +0100 @@ -257,7 +257,7 @@ + configName); } @@ -6834,8 +6846,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2016-04-22 04:41:51.761513040 +0100 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -6846,8 +6858,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2016-04-22 04:41:51.761513040 +0100 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -6867,8 +6879,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2016-04-22 04:41:51.761513040 +0100 @@ -165,7 +165,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -6897,8 +6909,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2016-04-22 04:41:51.761513040 +0100 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -6909,8 +6921,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2016-04-22 04:41:51.761513040 +0100 @@ -150,7 +150,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -6921,8 +6933,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2016-04-22 04:41:51.761513040 +0100 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -6933,8 +6945,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2016-04-22 04:41:51.761513040 +0100 @@ -249,7 +249,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -6945,8 +6957,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-01-20 01:42:39.581136457 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2016-04-22 04:39:36.839673402 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2016-04-22 04:41:51.761513040 +0100 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -6984,8 +6996,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2016-04-22 04:41:51.761513040 +0100 @@ -77,7 +77,7 @@ */ @@ -6996,8 +7008,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2016-04-22 04:41:51.761513040 +0100 @@ -466,7 +466,7 @@ */ static class KdcAccessibility { @@ -7020,8 +7032,8 @@ String t = st.nextToken(); if (bads.contains(t)) badkdcs.add(t); 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-01-20 01:42:38.125160952 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2016-04-22 04:39:36.795674106 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2016-04-22 04:41:51.761513040 +0100 @@ -265,7 +265,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -7041,8 +7053,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2016-04-22 04:41:51.761513040 +0100 @@ -375,7 +375,7 @@ return null; } @@ -7062,8 +7074,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2016-04-22 04:41:51.761513040 +0100 @@ -913,7 +913,7 @@ // Check for loops in the chain. If there are repeated certs, // the Set of certs in the chain will contain fewer certs than @@ -7074,8 +7086,8 @@ } 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2016-04-22 04:41:51.761513040 +0100 @@ -585,7 +585,7 @@ // Except the performance improvement, another benefit is to break // the dead loop while looking for the issuer back and forth @@ -7086,8 +7098,8 @@ if (prevKey != null) { // Add the previous certificate as a trust anchor. 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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2016-01-20 01:43:32.608244396 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2016-04-22 04:41:51.761513040 +0100 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -7098,8 +7110,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2016-01-20 01:43:32.612244329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2016-04-22 04:41:51.761513040 +0100 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -7155,8 +7167,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2016-01-20 01:43:32.612244329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2016-04-22 04:41:51.761513040 +0100 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -7167,8 +7179,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2016-01-20 01:43:32.612244329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2016-04-22 04:41:51.761513040 +0100 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -7179,8 +7191,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2016-01-20 01:43:32.612244329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2016-04-22 04:41:51.761513040 +0100 @@ -431,7 +431,7 @@ int peekByte; byte[] data; @@ -7236,8 +7248,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2016-01-20 01:43:32.612244329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2016-04-22 04:41:51.761513040 +0100 @@ -57,7 +57,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -7248,8 +7260,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2016-01-20 01:43:32.612244329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2016-04-22 04:41:51.761513040 +0100 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -7260,8 +7272,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2016-04-22 04:41:51.761513040 +0100 @@ -397,7 +397,7 @@ // Map BulkCipher -> Boolean(available) @@ -7272,8 +7284,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2016-04-22 04:41:51.765512976 +0100 @@ -752,7 +752,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -7311,8 +7323,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/DHCrypt.java 2016-04-22 04:41:51.765512976 +0100 @@ -367,7 +367,7 @@ } } @@ -7323,8 +7335,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2016-04-22 04:41:51.765512976 +0100 @@ -260,7 +260,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -7362,8 +7374,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-01-20 01:42:36.957180603 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2016-04-22 04:39:36.791674170 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2016-04-22 04:41:51.765512976 +0100 @@ -592,7 +592,7 @@ activeProtocols = getActiveProtocols(); } @@ -7383,8 +7395,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-01-20 01:41:46.518029234 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2016-04-22 04:39:34.823705657 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2016-04-22 04:41:51.765512976 +0100 @@ -169,7 +169,7 @@ return name; } @@ -7404,8 +7416,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2016-04-22 04:41:51.765512976 +0100 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -7416,8 +7428,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2016-04-22 04:41:51.765512976 +0100 @@ -106,7 +106,7 @@ // Initialize the available protocols. @@ -7428,8 +7440,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2016-01-20 01:44:03.383726718 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2016-04-22 04:41:51.765512976 +0100 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -7467,8 +7479,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmDecomposer.java 2016-04-22 04:41:51.765512976 +0100 @@ -48,7 +48,7 @@ } @@ -7506,8 +7518,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2016-04-22 04:41:51.765512976 +0100 @@ -327,7 +327,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -7545,8 +7557,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2016-01-20 01:43:32.616244262 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2016-04-22 04:41:51.765512976 +0100 @@ -642,7 +642,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -7566,8 +7578,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2016-04-22 04:41:51.765512976 +0100 @@ -2564,7 +2564,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -7578,8 +7590,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2016-04-22 04:41:51.765512976 +0100 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -7599,8 +7611,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2016-04-22 04:41:51.765512976 +0100 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -7611,8 +7623,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2016-04-22 04:41:51.765512976 +0100 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -7632,8 +7644,8 @@ return null; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2016-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2016-04-22 04:41:51.765512976 +0100 @@ -120,14 +120,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -7715,8 +7727,8 @@ KeyStore caks = KeyTool.getCacertsKeyStore(); if (caks != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2016-01-20 01:42:39.721134102 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2016-04-22 04:39:36.839673402 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2016-04-22 04:41:51.769512912 +0100 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -7787,8 +7799,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2016-04-22 04:41:51.769512912 +0100 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -7826,8 +7838,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java 2016-04-22 04:41:51.769512912 +0100 @@ -49,13 +49,13 @@ */ public Set<String> decompose(String algorithm) { @@ -7845,8 +7857,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/LegacyAlgorithmConstraints.java 2016-04-22 04:41:51.769512912 +0100 @@ -43,7 +43,7 @@ "jdk.tls.legacyAlgorithms"; @@ -7857,8 +7869,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-01-20 01:42:39.813132555 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2016-01-20 01:43:32.620244194 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2016-04-22 04:39:36.839673402 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2016-04-22 04:41:51.769512912 +0100 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -7869,8 +7881,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2016-04-22 04:41:51.769512912 +0100 @@ -1251,7 +1251,7 @@ if (exts == null) { return null; @@ -7918,8 +7930,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-04-22 04:41:51.769512912 +0100 @@ -352,7 +352,7 @@ if (extensions == null) { return null; @@ -7948,8 +7960,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-04-22 04:41:51.769512912 +0100 @@ -104,8 +104,8 @@ private X500Principal issuerPrincipal = null; private Date thisUpdate = null; @@ -7980,8 +7992,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2016-04-22 04:41:51.769512912 +0100 @@ -95,7 +95,7 @@ * Run the converter */ @@ -7992,8 +8004,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2016-04-22 04:41:51.769512912 +0100 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -8108,8 +8120,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2016-04-22 04:41:51.769512912 +0100 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -8165,8 +8177,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2016-04-22 04:41:51.769512912 +0100 @@ -81,7 +81,7 @@ } @@ -8194,8 +8206,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2016-04-22 04:41:51.769512912 +0100 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -8232,8 +8244,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2016-04-22 04:41:51.769512912 +0100 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -8253,8 +8265,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2016-04-22 04:41:51.769512912 +0100 @@ -187,7 +187,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -8274,8 +8286,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2016-04-22 04:41:51.769512912 +0100 @@ -160,7 +160,7 @@ } @@ -8310,8 +8322,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2016-04-22 04:41:51.769512912 +0100 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -8324,8 +8336,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2016-04-22 04:41:51.773512848 +0100 @@ -134,7 +134,7 @@ throws IOException { @@ -8336,8 +8348,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2016-04-22 04:41:51.773512848 +0100 @@ -157,7 +157,7 @@ @Override @@ -8438,8 +8450,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2016-04-22 04:41:51.773512848 +0100 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -8450,8 +8462,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2016-01-20 01:43:32.624244127 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2016-04-22 04:41:51.773512848 +0100 @@ -68,7 +68,7 @@ // We cache the C environment. This means that subsequent calls // to putenv/setenv from C will not be visible from Java code. @@ -8462,8 +8474,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-01-20 01:42:40.421122326 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2016-04-22 04:39:36.887672634 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2016-04-22 04:41:51.773512848 +0100 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -8528,8 +8540,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-04-22 04:41:51.773512848 +0100 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -8549,8 +8561,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2016-04-22 04:41:51.773512848 +0100 @@ -43,10 +43,10 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController { @@ -8565,8 +8577,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2016-04-22 04:41:51.773512848 +0100 @@ -133,7 +133,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); @@ -8577,8 +8589,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2016-04-22 04:41:51.773512848 +0100 @@ -136,7 +136,7 @@ // eventHigh needed when using file descriptors > 64k @@ -8589,8 +8601,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2016-04-22 04:41:51.773512848 +0100 @@ -67,7 +67,7 @@ fd1 = (int) pipeFds; pollWrapper = new EPollArrayWrapper(); @@ -8601,8 +8613,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2016-04-22 04:41:51.773512848 +0100 @@ -113,7 +113,7 @@ SocketAddress[] saa) { @@ -8613,8 +8625,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2016-04-22 04:41:51.773512848 +0100 @@ -153,12 +153,12 @@ static { @@ -8633,8 +8645,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2016-04-22 04:41:51.773512848 +0100 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -8654,8 +8666,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2016-04-22 04:41:51.773512848 +0100 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -8666,8 +8678,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2016-04-22 04:41:51.773512848 +0100 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -8678,8 +8690,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2016-04-22 04:41:51.773512848 +0100 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -8699,8 +8711,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2016-04-22 04:41:51.773512848 +0100 @@ -83,7 +83,7 @@ } @@ -8711,8 +8723,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2016-04-22 04:41:51.773512848 +0100 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -8723,8 +8735,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2016-04-22 04:41:51.773512848 +0100 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -8746,8 +8758,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2016-04-22 04:41:51.773512848 +0100 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -8758,8 +8770,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2016-04-22 04:41:51.773512848 +0100 @@ -128,7 +128,7 @@ } @@ -8770,8 +8782,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2016-04-22 04:41:51.773512848 +0100 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -8782,8 +8794,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2016-04-22 04:41:51.773512848 +0100 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -8794,8 +8806,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2016-01-20 01:43:32.628244060 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2016-04-22 04:41:51.773512848 +0100 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -8842,8 +8854,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2016-01-20 01:43:32.632243993 +0000 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2016-04-22 04:41:51.773512848 +0100 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -8854,8 +8866,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2016-01-20 01:43:32.632243993 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2016-04-22 04:41:51.773512848 +0100 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -8866,8 +8878,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2016-01-20 01:43:32.632243993 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2016-04-22 04:41:51.777512784 +0100 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -8878,8 +8890,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2016-01-20 01:43:32.632243993 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2016-04-22 04:41:51.777512784 +0100 @@ -103,7 +103,7 @@ } } @@ -8890,8 +8902,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2016-01-20 01:43:32.632243993 +0000 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2016-04-22 04:41:51.777512784 +0100 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -8902,8 +8914,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-01-18 18:22:09.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2016-01-20 01:43:32.632243993 +0000 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2016-04-22 03:53:51.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2016-04-22 04:41:51.777512784 +0100 @@ -59,7 +59,7 @@ } }