Mercurial > hg > icedtea7
changeset 2800:7040aac5c90e
Bump to icedtea-2.6pre23 and OpenJDK 7u80 b32.
Upstream changes:
* From 7u80
- S7178362: Socket impls should ignore unsupported proxy types rather than throwing
- S7180557: InetAddress.getLocalHost throws UnknownHostException on java7u5 on OSX
- S7196009: SunPkcs11 provider fails to parse config path containing parenthesis
- S8008386: (cs) Unmappable leading should be decoded to replacement.
- S8010371: getaddrinfo can fail with EAI_SYSTEM/EAGAIN, causes UnknownHostException to be thrown
- S8026245: InetAddress.getLocalHost crash if IPv6 disabled (macosx)
- S8027961: Inet[4|6]Address native initializing code should check field/MethodID values
- S8032573: CertificateFactory.getInstance("X.509").generateCertificates(InputStream) does not throw CertificateException for invalid input
- S8035938: Memory leak in JvmtiEnv::GetConstantPool
- S8037502: build.tools.javazic.Zoneinfo incorrectly calculates raw GMT offset change time
- S8055045: StringIndexOutOfBoundsException while reading krb5.conf
- S8057008: [TEST_BUG] Test java/awt/Focus/SortingFPT/JDK8048887.java fails with compilation error
- S8058113: Execution of OnOutOfMemoryError command hangs on linux-sparc
- S8058608: JVM crash during Kerberos logins using des3-cbc-md5 on OSX
- S8060170: Support SIO_LOOPBACK_FAST_PATH option on Windows
- S8062170: java.security.ProviderException: Error parsing configuration with space
- S8062923: XSL: Run-time internal error in 'substring()'
- S8062924: XSL: wrong answer from substring() function
- S8065238: javax.naming.NamingException after upgrade to JDK 8
- S8065553: Failed Java web start via IPv6 (Java7u71 or later)
- S8065994: HTTP Tunnel connection to NTLM proxy reauthenticates instead of using keep-alive
- S8068625: Remove extra year check for GenerateCurrencyData fix
- S8071423: Increment hsx 24.80 build to b08 for 7u80-b07
- S8071499: java/net/InetAddress/B5087907.java fails with jdk7u85
- S8071807: Increment hsx 24.80 build to b09 for 7u80-b08
- S8072040: jdk7u80 l10n resource file translation update
- S8072458: jdk/test/Makefile references (to be removed) win32 directory in jtreg
- S8072639: Increment hsx 24.80 build to b10 for 7u80-b09
- S8074855: [Regression] Test closed/java/awt/image/Raster/IncorrectScanlineStrideTest.java fails
- S8075092: Remove erroneous println statement from DoubleByteDecoder
* From the PPC & AIX port
- Changes to make aix compile after the merge
- S8069590: AIX port of "8050807: Better performing performance data handling"
- S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError
- S8080190: PPC64: Fix wrong rotate instructions in the .ad file
2015-06-12 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(BUILD_VERSION): Bump to b32.
(CORBA_CHANGESET): Update to icedtea-2.6pre23.
(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 and duplicates removed.
* configure.ac: Bump to 2.6.0pre23.
* hotspot.map.in: Update to icedtea-2.6pre23.
* patches/boot/ecj-diamond.patch: Regenerated.
Add new cases in
com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC and
sun.security.pkcs12.PKCS12KeyStore.java.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Sat, 13 Jun 2015 01:03:13 +0100 |
| parents | 909fa12f498c |
| children | 8188efd0009b |
| files | ChangeLog Makefile.am NEWS configure.ac hotspot.map.in patches/boot/ecj-diamond.patch |
| diffstat | 6 files changed, 688 insertions(+), 609 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 12 19:21:14 2015 +0100 +++ b/ChangeLog Sat Jun 13 01:03:13 2015 +0100 @@ -1,3 +1,27 @@ +2015-06-12 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (BUILD_VERSION): Bump to b32. + (CORBA_CHANGESET): Update to icedtea-2.6pre23. + (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 and duplicates removed. + * configure.ac: Bump to 2.6.0pre23. + * hotspot.map.in: Update to icedtea-2.6pre23. + * patches/boot/ecj-diamond.patch: Regenerated. + Add new cases in + com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC and + sun.security.pkcs12.PKCS12KeyStore.java. + 2015-06-12 Andrew John Hughes <gnu.andrew@member.fsf.org> * INSTALL:
--- a/Makefile.am Fri Jun 12 19:21:14 2015 +0100 +++ b/Makefile.am Sat Jun 13 01:03:13 2015 +0100 @@ -1,22 +1,22 @@ # Dependencies JDK_UPDATE_VERSION = 80 -BUILD_VERSION = b05 +BUILD_VERSION = b32 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = c92957e8516c -JAXP_CHANGESET = 8904cf73c048 -JAXWS_CHANGESET = d4de5503ba99 -JDK_CHANGESET = d17bcae64927 -LANGTOOLS_CHANGESET = a322987c412f -OPENJDK_CHANGESET = 851deec2e741 +CORBA_CHANGESET = 9d5c92264131 +JAXP_CHANGESET = 9150a16a7b80 +JAXWS_CHANGESET = 87290096a2fa +JDK_CHANGESET = ec336c81a545 +LANGTOOLS_CHANGESET = 403eeedf70f4 +OPENJDK_CHANGESET = 88ad67ad5b51 -CORBA_SHA256SUM = a07d372afc8d4478922dce71194f16dddaa339a590caac44ed63ec7a495419d0 -JAXP_SHA256SUM = ef5f00ad6ee1306502a75c4a99711cd4ec8202e891b734ab76f051255942bc46 -JAXWS_SHA256SUM = 809959c2c1a055e7997c064a5637e80b748f891a9908e37e4b97a8e9b5439868 -JDK_SHA256SUM = 542b0505e137e72148c948d92c3c1c280d01f46ed179b2e761b9f62935d3eae7 -LANGTOOLS_SHA256SUM = b83f713eb0908083f1535c99bb27715612ddd1be73a847518976d8cf2ea7ef2c -OPENJDK_SHA256SUM = 29c4ec54bfaad49e3b1f144562975c6e22504b576a9984a7bd61f17928eba219 +CORBA_SHA256SUM = 744b293bd34a570bc2155698a3e46572cb0e8433f7edcdcb594a37d8f8ac1cdd +JAXP_SHA256SUM = 7325b18725730e780049259b428c8814fa8686f49c27ff419e03cc6926e88f87 +JAXWS_SHA256SUM = 760c32f84da4cf8794d685431135a7017217f48a16449b78313648d8aeb89097 +JDK_SHA256SUM = 7019b768badebe30ec3cea2fe04b240b8760e9879d8d215f3b6151d8f1dce9ba +LANGTOOLS_SHA256SUM = 4389ea4ab8032be7ad1e4ad5f16d6b563059776b766e1672ecfff4b80d46f3e1 +OPENJDK_SHA256SUM = f2c024cae6479b49a864685a7c87b0e8109099e8057de878147363b579aa33ff DROP_URL = http://icedtea.classpath.org/download/drops
--- a/NEWS Fri Jun 12 19:21:14 2015 +0100 +++ b/NEWS Sat Jun 13 01:03:13 2015 +0100 @@ -41,15 +41,20 @@ - S7164841: Improvements to the GC log file rotation - S7172176: test/sun/tools/jconsole/ImmutableResourceTest.sh failing - S7172865: PropertyDescriptor fails to work with setter method name if setter is non-void + - S7178362: Socket impls should ignore unsupported proxy types rather than throwing - S7180038: regression test failure, SSLEngineBadBufferArrayAccess.java + - S7180557: InetAddress.getLocalHost throws UnknownHostException on java7u5 on OSX + - S7196009: SunPkcs11 provider fails to parse config path containing parenthesis - S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx] - S8001633: Wrong alt processing during switching between windows. - S8002148: [TEST_BUG] The four lines printed are not the bold typeface. - S8004488: wrong permissions checked in krb5 - S8006023: Embedded Builds fail management test because of requirement for UsePerfData being enabled. - S8008328: [partfait] Null pointer defererence in hotspot/src/cpu/x86/vm/frame_x86.inline.hpp + - S8008386: (cs) Unmappable leading should be decoded to replacement. - S8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so - S8009258: TEST_BUG:java/io/pathNames/GeneralWin32.java fails intermittently + - S8010371: getaddrinfo can fail with EAI_SYSTEM/EAGAIN, causes UnknownHostException to be thrown - S8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info - S8011795: DOM Serializer prints stack traces to System.err - S8012625: Incorrect handling of HTTP/1.1 " Expect: 100-continue " in HttpURLConnection @@ -76,10 +81,12 @@ - S8025644: java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java fails with TestData): failure java.lang.AssertionError: expected [true] but found [false] - S8025710: Proxied HTTPS connections reused by HttpClient can send CONNECT to the server - S8025917: JDK demo applets not running with >=7u40 or (JDK 8 and JDK 9) + - S8026245: InetAddress.getLocalHost crash if IPv6 disabled (macosx) - S8026303: CMS: JVM intermittently crashes with "FreeList of size 258 violates Conservation Principle" assert - S8027026: Change keytool -genkeypair to use -keyalg RSA - S8027348: (process) Enhancement of handling async close of ProcessInputStream - S8027695: There should be a space before % sign in Swedish locale + - S8027961: Inet[4|6]Address native initializing code should check field/MethodID values - S8028073: race condition in ObjectMonitor implementation causing deadlocks - S8028074: InetAddress.getByName fails with UHE "invalid IPv6 address" if host name starts with a-f - S8028159: C2: compiler stack overflow during inlining of @ForceInline methods @@ -92,7 +99,6 @@ - S8029775: Solaris code cleanup - S8030114: [parfait] warnings from b119 for jdk.src.share.native.sun.security.smartcardio: JNI exception pending - S8030192: TESTFAIL: java/util/logging/TestLoggerBundleSync.java failed with NPE - - S8030698: Several GUI labels in jconsole need correction - S8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning - S8030878: JConsole issues meaningless message if SSL connection fails - S8030976: Untaken paths should be more vigorously pruned at highest optimization level @@ -106,6 +112,7 @@ - S8031764: tmtools/jmap/heap_config tests fail on Linux-ia32 because it Cant attach to the core file - S8031765: Child process error stream is not empty! - S8032466: serviceability/sa/jmap-hashcode/Test8028623.java fails with compilation errors + - S8032573: CertificateFactory.getInstance("X.509").generateCertificates(InputStream) does not throw CertificateException for invalid input - S8032808: Support Solaris SO_FLOW_SLA socket option - S8032832: Applet/browser deadlocks, when IIS integrated authentication is used - S8032864: [macosx] sigsegv (0Xb) Being Generated When Starting JDev With Voiceover Running @@ -122,10 +129,11 @@ - S8034920: new hotspot build - hs24.80-b03 - S8035435: new hotspot build - hs24.80-b04 - S8035973: NPE in ForwardBuilder - - S8035988: 7u60 l10n resource file translation update 1 + - S8035938: Memory leak in JvmtiEnv::GetConstantPool - S8036778: new hotspot build - hs24.80-b05 - S8036823: Stack trace sometimes shows 'locked' instead of 'waiting to lock' - S8036981: JAXB not preserving formatting for xsd:any Mixed content + - S8037502: build.tools.javazic.Zoneinfo incorrectly calculates raw GMT offset change time - S8037945: Paths.get("").normalize() throws ArrayIndexOutOfBoundsException - S8038274: update 8u fix for 8028073 now that 8028280 is backported to 8u - S8038440: backport few C2 fixes @@ -176,12 +184,9 @@ - S8046516: Segmentation fault in JVM (easily reproducible) - S8046559: NPE when changing Windows theme - S8046588: test for SO_FLOW_SLA availability does not check for EACCESS - - S8046656: Update protocol support - - S8046769: Set T family feature bit on Niagara systems - S8047186: jdk.net.Sockets throws InvocationTargetException instead of original runtime exceptions - S8047187: Test jdk/net/Sockets/Test.java fails to compile after fix JDK-8046588 - S8047340: (process) Runtime.exec() fails in Turkish locale - - S8048035: Ensure proper proxy protocols - S8048050: Agent NullPointerException when rmi.port in use - S8048110: Using tables in JTextPane leads to infinite loop in FlowLayout.layoutRow - S8048170: Test closed/java/text/Normalizer/ConformanceTest.java failed @@ -200,31 +205,28 @@ - S8052159: TEST_BUG: javax/swing/JTextField/8036819/bug8036819.java fails to compile - S8052406: SSLv2Hello protocol may be filter out unexpectedly - S8054019: Keytool Error publicKey's is not X.509, but X509 - - S8054367: More references for endpoints - S8054478: C2: Incorrectly compiled char[] array access crashes JVM - S8054530: C2: assert(res == old_res) failed: Inconsistency between old and new - S8054817: File ccache only recognizes Linux and Solaris defaults - S8054841: (process) ProcessBuilder leaks native memory - S8054883: Segmentation error while running program - - S8055304: More boxing for DirectoryComboBoxModel - - S8055309: RMI needs better transportation considerations + - S8055045: StringIndexOutOfBoundsException while reading krb5.conf - S8055421: (fs) bad error handling in java.base/unix/native/libnio/fs/UnixNativeDispatcher.c - - S8055489: Better substitution formats - S8055731: sun/security/smartcardio/TestDirect.java throws java.lang.IndexOutOfBoundsException - S8055949: ByteArrayOutputStream capacity should be maximal array size permitted by VM - S8056026: Debug security logging should print Provider used for each crypto operation - S8056156: [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java fails in Windows - - S8056264: Multicast support improvements - - S8056276: Fontmanager feature improvements - S8056309: Set minor version for hotspot in 7u76 to 76 and build number to b01 - S8056914: Right Click Menu for Paste not showing after upgrading to java 7 + - S8057008: [TEST_BUG] Test java/awt/Focus/SortingFPT/JDK8048887.java fails with compilation error - S8057530: (process) Runtime.exec throws garbled message in jp locale - - S8057555: Less cryptic cipher suite management - S8057564: JVM hangs at getAgentProperties after attaching to VM with lower - S8057813: Alterations to jdk_security3 test target + - S8058113: Execution of OnOutOfMemoryError command hangs on linux-sparc - S8058120: Rendering / caret errors with HTMLDocument - S8058473: "Comparison method violates its general contract" when using Clipboard - S8058583: Remove CompilationRepeat + - S8058608: JVM crash during Kerberos logins using des3-cbc-md5 on OSX - S8058927: ATG throws ClassNotFoundException - S8058932: java/net/InetAddress/IPv4Formats.java failed because hello.foo.bar does exist - S8058935: CPU detection gives 0 cores per cpu, 2 threads per core in Amazon EC2 environment @@ -232,20 +234,22 @@ - S8059216: Make PrintGCApplicationStoppedTime print information about stopping threads - S8059299: assert(adr_type != NULL) failed: expecting TypeKlassPtr - S8059327: XML parser returns corrupt attribute value - - S8059485: Resolve parsing ambiguity - S8059563: (proxy) sun.misc.ProxyGenerator.generateProxyClass should create intermediate directories - S8060006: No Russian time zones mapping for Windows - S8060169: Update the Crash Reporting URL in the Java crash log - - S8061210: Issues in TLS + - S8060170: Support SIO_LOOPBACK_FAST_PATH option on Windows - S8061507: Increment hsx 24.76 build to b02 for 7u76-b05 - S8061694: Increment hsx 24.76 build to b03 for 7u76-b06 - S8061954: 7u76 - deployment warning dialogs do not work on Linux - S8062021: NPE in sun/lwawt/macosx/CPlatformWindow::toFront after JDK-8060146 + - S8062170: java.security.ProviderException: Error parsing configuration with space - S8062178: merge issue: Test closed/java/util/TimeZone/Bug6329116.java fails in 7u-cpu nightly - S8062608: BCEL corrupts debug data of methods that use generics - S8062672: JVM crashes during GC on various asserts which checks that HeapWord ptr is an oop - S8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS - S8062771: Core reflection should use final fields whenever possible + - S8062923: XSL: Run-time internal error in 'substring()' + - S8062924: XSL: wrong answer from substring() function - S8064391: More thread safety problems in core reflection - S8064407: (fc) FileChannel transferTo should use TransmitFile on Windows - S8064493: Increment the build value to b04 for hs24.76 in 7u76-b08 @@ -254,11 +258,14 @@ - S8064667: Add -XX:+CheckEndorsedAndExtDirs flag to JDK 8 - S8064846: Lazy-init thread safety problems in core reflection - S8065098: JColorChooser no longer supports drag and drop between two JVM instances + - S8065238: javax.naming.NamingException after upgrade to JDK 8 - S8065552: setAccessible(true) on fields of Class may throw a SecurityException + - S8065553: Failed Java web start via IPv6 (Java7u71 or later) - S8065609: 7u76 l10n resource file translation update - S8065618: C2 RA incorrectly removes kill projections - S8065674: javac generates incorrect LVT table for trivial cases - S8065765: Missing space in output message from -XX:+CheckEndorsedAndExtDirs + - S8065994: HTTP Tunnel connection to NTLM proxy reauthenticates instead of using keep-alive - S8066045: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 - S8066103: C2's range check smearing allows out of bound array accesses - S8066612: Add a test that will call getDeclaredFields() on all classes and try to set them accessible. @@ -267,7 +274,16 @@ - S8066775: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 - S8068338: Better message about incompatible zlib in Deflater.init - S8068507: (fc) Rename the new jdk.net.enableFastFileTransfer system property to jdk.nio.enableFastFileTransfer + - S8068625: Remove extra year check for GenerateCurrencyData fix - S8068639: Make certain annotation classfile warnings opt-in + - S8071423: Increment hsx 24.80 build to b08 for 7u80-b07 + - S8071499: java/net/InetAddress/B5087907.java fails with jdk7u85 + - S8071807: Increment hsx 24.80 build to b09 for 7u80-b08 + - S8072040: jdk7u80 l10n resource file translation update + - S8072458: jdk/test/Makefile references (to be removed) win32 directory in jtreg + - S8072639: Increment hsx 24.80 build to b10 for 7u80-b09 + - S8074855: [Regression] Test closed/java/awt/image/Raster/IncorrectScanlineStrideTest.java fails + - S8075092: Remove erroneous println statement from DoubleByteDecoder * Backports - S4890063, PR2305, RH1214835: HPROF: default text truncated when using doe=n option - S6991580, PR2308, RH1210739: IPv6 Nameservers in resolv.conf throws NumberFormatException @@ -304,6 +320,11 @@ - S8076467: AARCH64: assertion fail with -XX:+UseG1GC - S8079203: AARCH64: Need to cater for different partner implementations - S8080586: aarch64: hotspot test compiler/codegen/7184394/TestAESMain.java fails +* PPC & AIX port + - Changes to make aix compile after the merge + - S8069590: AIX port of "8050807: Better performing performance data handling" + - S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError + - S8080190: PPC64: Fix wrong rotate instructions in the .ad file New in release 2.5.5 (2015-04-14):
--- a/configure.ac Fri Jun 12 19:21:14 2015 +0100 +++ b/configure.ac Sat Jun 13 01:03:13 2015 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.0pre22], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.6.0pre23], [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 Jun 12 19:21:14 2015 +0100 +++ b/hotspot.map.in Sat Jun 13 01:03:13 2015 +0100 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ cb42e88f9787 a5d774f3d3fe6589fb24d16307070489acb6f68903495c472d3f552284321e08 +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1afefe2d5f90 e12e2d3d7b228abc3fa12a75455d3af883bce94f58df65e16e7f953592747054
--- a/patches/boot/ecj-diamond.patch Fri Jun 12 19:21:14 2015 +0100 +++ b/patches/boot/ecj-diamond.patch Sat Jun 13 01:03:13 2015 +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 2015-01-29 22:20:19.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-01-30 03:30:15.833325373 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-06-12 17:38:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-06-12 23:34:39.974231621 +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 2015-01-29 22:20:19.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-01-30 03:30:15.833325373 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-06-12 17:38:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-06-12 23:34:39.978231551 +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 2015-01-29 22:20:19.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-01-30 03:30:15.833325373 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-06-12 17:38:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-06-12 23:34:39.978231551 +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 2015-01-29 22:20:19.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-01-30 03:30:15.833325373 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-06-12 17:38:31.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-06-12 23:34:39.978231551 +0100 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -55,9 +55,21 @@ } for (WorkerThread wt : copy) { +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 2015-06-12 17:38:32.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2015-06-12 23:34:39.978231551 +0100 +@@ -173,7 +173,7 @@ + _parser = new Parser(this, useServicesMechanism); + _featureManager = featureManager; + _extensionClassLoader = null; +- _externalExtensionFunctions = new HashMap<>(); ++ _externalExtensionFunctions = new HashMap<String, Class>(); + } + + /** 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 2015-01-30 03:29:04.252446195 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-01-30 03:30:15.833325373 +0000 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-06-12 23:14:47.187405507 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-06-12 23:34:39.978231551 +0100 @@ -297,8 +297,8 @@ // private final static class EncodingInfos { @@ -79,8 +91,8 @@ final String javaName = (String) keys.nextElement(); final String[] mimes = parseMimeTypes(props.getProperty(javaName)); 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-01-30 03:30:15.833325373 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-06-12 23:34:39.978231551 +0100 @@ -63,9 +63,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -96,8 +108,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-06-12 23:34:39.978231551 +0100 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -117,8 +129,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-06-12 23:34:39.978231551 +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 @@ -165,8 +177,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-06-12 23:34:39.978231551 +0100 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -238,8 +250,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 2015-01-30 03:29:05.176457544 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-06-12 23:14:47.231404715 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-06-12 23:34:39.978231551 +0100 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -302,8 +314,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 2015-01-30 03:29:02.384423250 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-06-12 23:14:47.135406443 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-06-12 23:34:39.978231551 +0100 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -314,8 +326,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-06-12 23:34:39.978231551 +0100 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -352,8 +364,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-06-12 23:34:39.978231551 +0100 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -364,8 +376,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-06-12 23:34:39.982231481 +0100 @@ -921,7 +921,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -394,8 +406,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 2015-01-30 03:29:05.180457593 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-06-12 23:14:47.231404715 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-06-12 23:34:39.982231481 +0100 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -433,8 +445,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-06-12 23:34:39.982231481 +0100 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -445,8 +457,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 2015-01-30 03:29:02.616426100 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-01-30 03:30:15.837325421 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-06-12 23:14:47.135406443 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-06-12 23:34:39.982231481 +0100 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -602,8 +614,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 2015-01-30 03:29:05.180457593 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-06-12 23:14:47.231404715 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-06-12 23:34:39.982231481 +0100 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -717,8 +729,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 2015-01-30 03:29:05.180457593 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-06-12 23:14:47.231404715 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-06-12 23:34:39.982231481 +0100 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -774,8 +786,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-06-12 23:34:39.982231481 +0100 @@ -183,8 +183,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -806,8 +818,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-06-12 23:34:39.982231481 +0100 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -818,8 +830,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 2015-01-30 03:29:05.180457593 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-06-12 23:14:47.231404715 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-06-12 23:34:39.982231481 +0100 @@ -48,8 +48,8 @@ */ @@ -850,8 +862,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-06-12 23:34:39.982231481 +0100 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -872,8 +884,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 2015-01-30 03:29:05.180457593 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-06-12 23:14:47.231404715 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-06-12 23:34:39.982231481 +0100 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -884,8 +896,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 2015-01-30 03:29:05.180457593 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-06-12 23:14:47.231404715 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-06-12 23:34:39.982231481 +0100 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -896,8 +908,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-06-12 23:34:39.982231481 +0100 @@ -56,7 +56,7 @@ // principal in the delegated subject // @@ -908,8 +920,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-06-12 23:34:39.982231481 +0100 @@ -54,7 +54,7 @@ * Contains event dispatcher per thread group. */ @@ -920,8 +932,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-06-12 23:34:39.982231481 +0100 @@ -102,7 +102,7 @@ && !SoundbankReader.class.equals(serviceClass) && !MidiFileWriter.class.equals(serviceClass) @@ -932,8 +944,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-01-30 03:30:15.841325470 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-06-12 23:34:39.982231481 +0100 @@ -59,7 +59,7 @@ * dispatcher instance with a factory in EventDispatcher */ @@ -944,8 +956,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2015-01-30 03:30:15.845325520 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2015-06-12 23:34:39.986231411 +0100 @@ -231,7 +231,7 @@ * Create an empty ExecOptionPermissionCollection. */ @@ -956,8 +968,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2015-01-30 03:30:15.845325520 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2015-06-12 23:34:39.986231411 +0100 @@ -235,7 +235,7 @@ * Create an empty ExecPermissionCollection. */ @@ -968,8 +980,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2015-01-30 03:30:15.845325520 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2015-06-12 23:34:39.986231411 +0100 @@ -1285,7 +1285,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -989,8 +1001,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2015-01-30 03:30:15.845325520 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2015-06-12 23:34:39.986231411 +0100 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -1001,8 +1013,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2015-01-30 03:30:15.849325568 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2015-06-12 23:34:39.986231411 +0100 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -1017,8 +1029,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2015-01-30 03:30:15.849325568 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2015-06-12 23:34:39.986231411 +0100 @@ -152,7 +152,7 @@ // new configuration @@ -1047,8 +1059,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2015-01-30 03:30:15.849325568 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2015-06-12 23:34:39.986231411 +0100 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -1059,8 +1071,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2015-01-30 03:30:15.849325568 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2015-06-12 23:34:39.990231342 +0100 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -1071,8 +1083,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2015-01-30 03:30:15.849325568 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2015-06-12 23:34:39.990231342 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -1083,8 +1095,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2015-01-30 03:30:15.849325568 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2015-06-12 23:34:39.990231342 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -1095,8 +1107,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2015-01-30 03:30:15.849325568 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2015-06-12 23:34:39.990231342 +0100 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -1107,8 +1119,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2015-06-12 23:34:39.990231342 +0100 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -1119,8 +1131,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2015-06-12 23:34:39.990231342 +0100 @@ -97,7 +97,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -1149,8 +1161,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2015-06-12 23:34:39.990231342 +0100 @@ -44,7 +44,7 @@ } else { @@ -1170,8 +1182,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2015-06-12 23:34:39.990231342 +0100 @@ -96,7 +96,7 @@ BeanInfo putBeanInfo(Class<?> type, BeanInfo info) { @@ -1182,8 +1194,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2015-06-12 23:34:39.990231342 +0100 @@ -34,7 +34,7 @@ */ @@ -1203,8 +1215,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2015-06-12 23:34:39.990231342 +0100 @@ -61,7 +61,7 @@ private volatile boolean closed = false; @@ -1215,8 +1227,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2015-06-12 23:34:39.990231342 +0100 @@ -1150,7 +1150,7 @@ if ((names == null) || (filter == null)) { return names; @@ -1245,8 +1257,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2015-06-12 23:34:39.990231342 +0100 @@ -76,7 +76,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -1257,8 +1269,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2015-06-12 23:34:39.990231342 +0100 @@ -725,7 +725,7 @@ */ @@ -1287,8 +1299,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2015-06-12 23:34:39.990231342 +0100 @@ -214,7 +214,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -1313,8 +1325,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2015-06-12 23:34:39.994231272 +0100 @@ -166,11 +166,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1339,8 +1351,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2015-06-12 23:34:39.994231272 +0100 @@ -87,18 +87,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1430,8 +1442,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2015-01-30 03:30:15.853325618 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2015-06-12 23:34:39.994231272 +0100 @@ -47,7 +47,7 @@ } } @@ -1442,8 +1454,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2015-06-12 23:34:39.994231272 +0100 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1464,8 +1476,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2015-06-12 23:34:39.994231272 +0100 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1476,8 +1488,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2015-06-12 23:34:39.998231202 +0100 @@ -1359,7 +1359,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -1530,8 +1542,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2015-06-12 23:34:39.998231202 +0100 @@ -248,7 +248,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1638,8 +1650,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2015-06-12 23:34:39.998231202 +0100 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -1681,8 +1693,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 2015-01-30 03:29:05.592462654 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2015-06-12 23:14:47.255404283 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2015-06-12 23:34:39.998231202 +0100 @@ -393,7 +393,7 @@ } private boolean isPlaceholder() { return clazz == null; } @@ -1693,8 +1705,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2015-06-12 23:34:39.998231202 +0100 @@ -327,7 +327,7 @@ if (UNSAFE.shouldBeInitialized(type)) // If the previous call didn't block, this can happen. @@ -1705,8 +1717,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 2015-01-30 03:29:05.592462654 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2015-01-30 03:30:15.857325668 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2015-06-12 23:14:47.255404283 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2015-06-12 23:34:39.998231202 +0100 @@ -129,7 +129,7 @@ static { @@ -1726,8 +1738,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 2015-01-30 03:29:05.592462654 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2015-06-12 23:14:47.259404210 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2015-06-12 23:34:39.998231202 +0100 @@ -468,12 +468,12 @@ int capacity = 512; // expect many distinct signatures over time float loadFactor = 0.75f; // normal default @@ -1744,8 +1756,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2015-06-12 23:34:39.998231202 +0100 @@ -808,14 +808,14 @@ // JVM returned to us with an intentional overflow! totalCount += buf.length; @@ -1764,8 +1776,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 2015-01-30 03:29:05.592462654 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2015-06-12 23:14:47.259404210 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2015-06-12 23:34:39.998231202 +0100 @@ -73,8 +73,8 @@ static final class ArrayAccessor { @@ -1787,8 +1799,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2015-06-12 23:34:39.998231202 +0100 @@ -834,7 +834,7 @@ } } @@ -1799,8 +1811,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2015-06-12 23:34:39.998231202 +0100 @@ -1950,7 +1950,7 @@ int inargs = outargs + dropped; if (pos < 0 || pos >= inargs) @@ -1811,8 +1823,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2015-06-12 23:34:40.002231132 +0100 @@ -1048,7 +1048,7 @@ private final float loadFactor; @@ -1823,8 +1835,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 2015-01-30 03:29:05.144457151 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2015-06-12 23:14:47.195405363 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2015-06-12 23:34:40.002231132 +0100 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -1835,8 +1847,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2015-06-12 23:34:40.002231132 +0100 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -1874,8 +1886,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 2015-01-30 03:29:05.180457593 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2015-06-12 23:14:47.235404642 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2015-06-12 23:34:40.002231132 +0100 @@ -599,13 +599,16 @@ } @@ -1897,8 +1909,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 2015-01-30 03:29:05.144457151 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2015-06-12 23:14:47.195405363 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2015-06-12 23:34:40.002231132 +0100 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1918,8 +1930,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2015-06-12 23:34:40.002231132 +0100 @@ -137,7 +137,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1930,8 +1942,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 2015-01-30 03:29:05.144457151 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2015-06-12 23:14:47.195405363 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2015-06-12 23:34:40.002231132 +0100 @@ -234,7 +234,7 @@ * a cache of proxy classes */ @@ -1951,8 +1963,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2015-06-12 23:34:40.002231132 +0100 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1963,8 +1975,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2015-01-30 03:30:15.861325716 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2015-06-12 23:34:40.002231132 +0100 @@ -71,12 +71,12 @@ } @@ -2018,8 +2030,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2015-06-12 23:34:40.002231132 +0100 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -2033,8 +2045,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2015-06-12 23:34:40.002231132 +0100 @@ -2282,7 +2282,7 @@ int off = 0; int next = 0; @@ -2045,8 +2057,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2015-06-12 23:34:40.002231132 +0100 @@ -1638,7 +1638,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -2072,8 +2084,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2015-06-12 23:34:40.002231132 +0100 @@ -918,7 +918,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -2093,8 +2105,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2015-06-12 23:34:40.006231063 +0100 @@ -712,7 +712,7 @@ static InetAddressImpl impl; @@ -2114,8 +2126,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2015-06-12 23:34:40.006231063 +0100 @@ -205,7 +205,7 @@ */ @@ -2126,8 +2138,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 2015-01-30 03:29:05.184457643 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2015-06-12 23:14:47.235404642 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2015-06-12 23:34:40.006231063 +0100 @@ -1504,7 +1504,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -2147,8 +2159,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2015-06-12 23:34:40.006231063 +0100 @@ -127,7 +127,7 @@ this.context = null; } @@ -2159,8 +2171,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2015-06-12 23:34:40.006231063 +0100 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -2171,8 +2183,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2015-06-12 23:34:40.006231063 +0100 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -2196,8 +2208,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2015-06-12 23:34:40.006231063 +0100 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -2217,8 +2229,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2015-06-12 23:34:40.006231063 +0100 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -2238,8 +2250,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2015-01-30 03:30:15.865325765 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2015-06-12 23:34:40.006231063 +0100 @@ -373,8 +373,8 @@ int swag = 32; int vcap = 8; @@ -2252,8 +2264,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2015-06-12 23:34:40.006231063 +0100 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -2282,8 +2294,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2015-06-12 23:34:40.006231063 +0100 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -2294,8 +2306,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2015-06-12 23:34:40.006231063 +0100 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -2342,8 +2354,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2015-06-12 23:34:40.006231063 +0100 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -2381,8 +2393,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2015-06-12 23:34:40.006231063 +0100 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -2393,8 +2405,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2015-06-12 23:34:40.006231063 +0100 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -2424,8 +2436,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2015-06-12 23:34:40.010230993 +0100 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -2436,8 +2448,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2015-06-12 23:34:40.010230993 +0100 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -3063,8 +3075,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 2015-01-30 03:29:05.184457643 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2015-06-12 23:14:47.235404642 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2015-06-12 23:34:40.010230993 +0100 @@ -101,7 +101,7 @@ // class data: instance map @@ -3075,8 +3087,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2015-06-12 23:34:40.010230993 +0100 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -3087,8 +3099,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2015-01-30 03:30:15.869325815 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2015-06-12 23:34:40.010230993 +0100 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -3111,8 +3123,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 2015-01-30 03:29:05.148457201 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2015-06-12 23:14:47.199405290 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2015-06-12 23:34:40.010230993 +0100 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -3123,8 +3135,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2015-06-12 23:34:40.010230993 +0100 @@ -894,7 +894,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -3135,8 +3147,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2015-06-12 23:34:40.010230993 +0100 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -3183,8 +3195,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2015-06-12 23:34:40.014230924 +0100 @@ -538,7 +538,7 @@ // Creates the new entry. @@ -3240,8 +3252,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2015-06-12 23:34:40.014230924 +0100 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -3261,8 +3273,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2015-06-12 23:34:40.014230924 +0100 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -3273,8 +3285,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2015-06-12 23:34:40.014230924 +0100 @@ -238,7 +238,7 @@ */ @Override @@ -3294,8 +3306,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2015-06-12 23:34:40.014230924 +0100 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -3333,8 +3345,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2015-06-12 23:34:40.014230924 +0100 @@ -187,7 +187,7 @@ return; @@ -3345,8 +3357,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2015-06-12 23:34:40.014230924 +0100 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -3357,8 +3369,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2015-06-12 23:34:40.014230924 +0100 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -3369,8 +3381,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2015-06-12 23:34:40.014230924 +0100 @@ -518,8 +518,8 @@ // were final, the following KnownLevel implementation can be removed. // Future API change should take this into consideration. @@ -3400,8 +3412,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2015-01-30 03:30:15.873325863 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2015-06-12 23:34:40.014230924 +0100 @@ -177,7 +177,7 @@ private volatile LogManager manager; private String name; @@ -3421,8 +3433,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2015-06-12 23:34:40.014230924 +0100 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -3433,11 +3445,11 @@ 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2015-06-12 23:34:40.014230924 +0100 @@ -389,7 +389,7 @@ - final Object ecx = javaAwtAccess.getAppletContext(); - if (ecx != null) { + // find the AppContext of the applet code + // will be null if we are in the main app context. if (contextsMap == null) { - contextsMap = new WeakHashMap<>(); + contextsMap = new WeakHashMap<Object, LoggerContext>(); @@ -3490,8 +3502,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2015-06-12 23:34:40.014230924 +0100 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -3503,8 +3515,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2015-06-12 23:34:40.014230924 +0100 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -3535,8 +3547,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2015-06-12 23:34:40.018230853 +0100 @@ -538,7 +538,7 @@ cursor--; else { @@ -3547,8 +3559,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2015-06-12 23:34:40.018230853 +0100 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -3559,8 +3571,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2015-06-12 23:34:40.018230853 +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> @@ -3598,8 +3610,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2015-06-12 23:34:40.018230853 +0100 @@ -193,8 +193,8 @@ } }; @@ -3612,8 +3624,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2015-06-12 23:34:40.018230853 +0100 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -3624,8 +3636,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2015-06-12 23:34:40.018230853 +0100 @@ -291,7 +291,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -3690,8 +3702,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2015-06-12 23:34:40.018230853 +0100 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3720,8 +3732,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2015-01-30 03:30:15.877325913 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2015-06-12 23:34:40.018230853 +0100 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3732,8 +3744,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2015-06-12 23:34:40.018230853 +0100 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3789,8 +3801,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2015-06-12 23:34:40.018230853 +0100 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3858,8 +3870,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2015-06-12 23:34:40.018230853 +0100 @@ -172,7 +172,7 @@ /** * Reference queue for cleared WeakEntries @@ -3892,8 +3904,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2015-06-12 23:34:40.022230784 +0100 @@ -321,7 +321,7 @@ // the outstanding inputstreams that need to be closed, @@ -3922,8 +3934,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2015-06-12 23:34:40.022230784 +0100 @@ -53,8 +53,8 @@ } @@ -3936,8 +3948,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2015-06-12 23:34:40.022230784 +0100 @@ -84,7 +84,7 @@ * no CryptoPermissionCollections. */ @@ -3976,8 +3988,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2015-06-12 23:34:40.022230784 +0100 @@ -54,7 +54,7 @@ private static final CryptoAllPermission allPerm; private static final Vector TrustedCallersCache = new Vector(2); @@ -3988,8 +4000,8 @@ new CryptoPermissions(); 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2015-06-12 23:34:40.022230784 +0100 @@ -116,7 +116,7 @@ return null; } @@ -4000,8 +4012,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2015-06-12 23:34:40.022230784 +0100 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -4012,8 +4024,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2015-06-12 23:34:40.022230784 +0100 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -4024,8 +4036,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2015-06-12 23:34:40.022230784 +0100 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -4036,8 +4048,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2015-06-12 23:34:40.022230784 +0100 @@ -48,7 +48,7 @@ private Subject subject; @@ -4048,8 +4060,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2015-06-12 23:34:40.022230784 +0100 @@ -267,7 +267,7 @@ private static Collection<JInternalFrame> getAllFrames(Container parent) { @@ -4060,8 +4072,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2015-06-12 23:34:40.022230784 +0100 @@ -58,7 +58,7 @@ public class Sockets { @@ -4108,8 +4120,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2015-06-12 23:34:40.022230784 +0100 @@ -109,7 +109,7 @@ * Note that this only applies to createFont() from an InputStream object. */ @@ -4120,8 +4132,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 2015-01-30 03:29:05.592462654 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2015-06-12 23:14:47.259404210 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2015-06-12 23:34:40.022230784 +0100 @@ -60,7 +60,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap<?,?>[n]; @@ -4159,8 +4171,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2015-01-30 03:30:15.881325962 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2015-06-12 23:34:40.022230784 +0100 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -4171,8 +4183,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2015-06-12 23:34:40.022230784 +0100 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -4183,8 +4195,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 2015-01-30 03:29:05.184457643 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2015-06-12 23:14:47.239404571 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2015-06-12 23:34:40.022230784 +0100 @@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -4222,8 +4234,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2015-06-12 23:34:40.022230784 +0100 @@ -120,7 +120,7 @@ String key = null, value = null; @@ -4234,8 +4246,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2015-06-12 23:34:40.022230784 +0100 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -4246,8 +4258,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2015-06-12 23:34:40.026230714 +0100 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -4276,8 +4288,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2015-06-12 23:34:40.026230714 +0100 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -4288,8 +4300,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2015-06-12 23:34:40.026230714 +0100 @@ -2659,7 +2659,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -4309,8 +4321,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2015-06-12 23:34:40.026230714 +0100 @@ -239,7 +239,7 @@ url = null; } @@ -4321,8 +4333,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2015-06-12 23:34:40.026230714 +0100 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -4360,8 +4372,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2015-06-12 23:34:40.026230714 +0100 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -4372,8 +4384,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2015-06-12 23:34:40.026230714 +0100 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -4386,8 +4398,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2015-06-12 23:34:40.026230714 +0100 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -4398,8 +4410,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2015-06-12 23:34:40.026230714 +0100 @@ -77,7 +77,7 @@ throws IOException { @@ -4419,8 +4431,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2015-06-12 23:34:40.026230714 +0100 @@ -71,7 +71,7 @@ @Override @@ -4431,8 +4443,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2015-06-12 23:34:40.026230714 +0100 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -4452,8 +4464,8 @@ set.add(e); } 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2015-06-12 23:34:40.026230714 +0100 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -4518,8 +4530,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2015-06-12 23:34:40.026230714 +0100 @@ -78,9 +78,9 @@ /* indicate compatibility with JDK 1.1.x version of class */ private static final long serialVersionUID = 4666870661827494597L; @@ -4533,8 +4545,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2015-01-30 03:30:15.885326011 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2015-06-12 23:34:40.026230714 +0100 @@ -160,7 +160,7 @@ } @@ -4545,8 +4557,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2015-06-12 23:34:40.026230714 +0100 @@ -184,7 +184,7 @@ destDir = null; flags = F_WARNINGS; @@ -4566,8 +4578,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2015-06-12 23:34:40.026230714 +0100 @@ -61,7 +61,7 @@ */ public class RMIGenerator implements RMIConstants, Generator { @@ -4587,8 +4599,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 2015-01-30 03:29:05.148457201 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2015-06-12 23:14:47.199405290 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2015-06-12 23:34:40.026230714 +0100 @@ -66,10 +66,10 @@ /** maps persistent IDs to activated remote objects */ @@ -4603,8 +4615,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 2015-01-30 03:29:05.188457691 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2015-06-12 23:14:47.239404571 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2015-06-12 23:34:40.030230645 +0100 @@ -149,10 +149,10 @@ /** maps activation id to its respective group id */ @@ -4661,8 +4673,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 2015-01-30 03:29:05.148457201 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2015-06-12 23:14:47.199405290 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2015-06-12 23:34:40.030230645 +0100 @@ -113,11 +113,11 @@ * garbage collected. */ @@ -4687,8 +4699,8 @@ /** * Convert an array of URL objects into a corresponding string diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2015-06-12 23:34:40.030230645 +0100 @@ -71,14 +71,14 @@ /** table to hold sun classes to which access is explicitly permitted */ @@ -4707,8 +4719,8 @@ /** * if true, load classes (if not available locally) only from the diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2015-06-12 23:34:40.030230645 +0100 @@ -537,7 +537,7 @@ HashToMethod_Maps() {} @@ -4719,8 +4731,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2015-06-12 23:34:40.030230645 +0100 @@ -207,7 +207,7 @@ * @throws NullPointerException if remoteClass is null */ @@ -4731,8 +4743,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2015-06-12 23:34:40.030230645 +0100 @@ -46,7 +46,7 @@ **/ public abstract class WeakClassHashMap<V> { @@ -4743,8 +4755,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2015-06-12 23:34:40.030230645 +0100 @@ -43,7 +43,7 @@ private boolean dgcAckNeeded = false; @@ -4755,8 +4767,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2015-06-12 23:34:40.030230645 +0100 @@ -78,7 +78,7 @@ Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>()); @@ -4767,8 +4779,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2015-06-12 23:34:40.030230645 +0100 @@ -176,9 +176,9 @@ private DGC dgc; @@ -4840,8 +4852,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2015-06-12 23:34:40.030230645 +0100 @@ -84,7 +84,7 @@ /** remote implementation of DGC interface for this VM */ private static DGCImpl dgc; @@ -4870,8 +4882,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2015-06-12 23:34:40.030230645 +0100 @@ -62,9 +62,9 @@ /** tables mapping to Target, keyed from ObjectEndpoint and impl object */ @@ -4894,8 +4906,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2015-06-12 23:34:40.030230645 +0100 @@ -116,7 +116,7 @@ /* construct table mapping command strings to handlers */ private static Hashtable<String, CGICommandHandler> commandLookup; @@ -4906,8 +4918,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 2015-01-30 03:29:05.188457691 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2015-06-12 23:14:47.239404571 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2015-06-12 23:34:40.030230645 +0100 @@ -75,13 +75,13 @@ /** table of hosts successfully connected to and the factory used */ @@ -4934,8 +4946,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2015-06-12 23:34:40.030230645 +0100 @@ -53,10 +53,10 @@ /** stub for remote object */ private final Remote stub; @@ -4950,8 +4962,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2015-01-30 03:30:15.889326060 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2015-06-12 23:34:40.030230645 +0100 @@ -85,7 +85,7 @@ private DataOutputStream dataOut; @@ -4962,8 +4974,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2015-06-12 23:34:40.030230645 +0100 @@ -64,7 +64,7 @@ private final TCPTransport tr; /** list of cached connections */ @@ -4983,8 +4995,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 2015-01-30 03:29:05.148457201 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2015-06-12 23:14:47.199405290 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2015-06-12 23:34:40.030230645 +0100 @@ -148,7 +148,7 @@ // TBD: should this be a weak hash table? private static final @@ -4995,8 +5007,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2015-01-30 03:30:55.233809279 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2015-06-12 23:34:40.030230645 +0100 @@ -123,7 +123,7 @@ /** client host for the current thread's connection */ @@ -5016,8 +5028,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2015-06-12 23:34:40.034230575 +0100 @@ -66,7 +66,7 @@ Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel); @@ -5028,8 +5040,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2015-06-12 23:34:40.034230575 +0100 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -5040,8 +5052,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2015-06-12 23:34:40.034230575 +0100 @@ -41,15 +41,15 @@ // or principal. // @@ -5082,8 +5094,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2015-06-12 23:34:40.034230575 +0100 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -5103,8 +5115,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2015-06-12 23:34:40.034230575 +0100 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -5142,8 +5154,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2015-06-12 23:34:40.034230575 +0100 @@ -40,7 +40,7 @@ public class Providers { @@ -5154,8 +5166,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2015-06-12 23:34:40.034230575 +0100 @@ -251,7 +251,7 @@ } @@ -5166,8 +5178,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2015-06-12 23:34:40.034230575 +0100 @@ -576,7 +576,7 @@ } }))); @@ -5204,7 +5216,7 @@ temp = parseRealmField(v, i + 1, count); table.put("capaths", temp); i = count - 1; -@@ -809,7 +809,7 @@ +@@ -811,7 +811,7 @@ * Parses key-value pairs under a stanza name. */ private Hashtable<String,String> parseField(Vector<String> v, int start, int end) { @@ -5213,7 +5225,7 @@ String line; for (int i = start; i < end; i++) { line = v.elementAt(i); -@@ -831,7 +831,7 @@ +@@ -833,7 +833,7 @@ * information for the realm given within a pair of braces. */ private Hashtable<String,Hashtable<String,Vector<String>>> parseRealmField(Vector<String> v, int start, int end) { @@ -5222,7 +5234,7 @@ String line; for (int i = start; i < end; i++) { line = v.elementAt(i).trim(); -@@ -871,9 +871,9 @@ +@@ -873,9 +873,9 @@ * Parses key-value pairs within each braces under [realms]. */ private Hashtable<String,Vector<String>> parseRealmFieldEx(Vector<String> v, int start, int end) { @@ -5235,7 +5247,7 @@ String line = ""; String key; for (int i = start; i < end; i++) { -@@ -978,7 +978,7 @@ +@@ -980,7 +980,7 @@ } st = new StringTokenizer(default_enctypes, delim); int len = st.countTokens(); @@ -5245,8 +5257,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2015-06-12 23:34:40.034230575 +0100 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5257,8 +5269,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2015-06-12 23:34:40.034230575 +0100 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5269,9 +5281,9 @@ 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-01-30 03:30:15.893326110 +0000 -@@ -543,7 +543,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-06-12 23:14:47.247404427 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-06-12 23:34:40.034230575 +0100 +@@ -577,7 +577,7 @@ private static String exec(String c) { StringTokenizer st = new StringTokenizer(c); @@ -5281,8 +5293,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2015-06-12 23:34:40.034230575 +0100 @@ -257,7 +257,7 @@ + configName); } @@ -5293,8 +5305,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2015-06-12 23:34:40.034230575 +0100 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5305,8 +5317,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2015-06-12 23:34:40.034230575 +0100 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -5326,8 +5338,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2015-06-12 23:34:40.034230575 +0100 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -5356,8 +5368,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2015-01-30 03:30:15.893326110 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2015-06-12 23:34:40.034230575 +0100 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -5368,8 +5380,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2015-06-12 23:34:40.034230575 +0100 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5380,8 +5392,8 @@ if (prealm != null) v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), prealm.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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2015-06-12 23:34:40.034230575 +0100 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -5392,8 +5404,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2015-06-12 23:34:40.034230575 +0100 @@ -259,7 +259,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -5404,8 +5416,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 2015-01-30 03:29:05.556462212 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2015-06-12 23:14:47.239404571 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2015-06-12 23:34:40.034230575 +0100 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -5443,8 +5455,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2015-06-12 23:34:40.038230505 +0100 @@ -77,7 +77,7 @@ */ @@ -5455,8 +5467,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2015-06-12 23:34:40.038230505 +0100 @@ -466,7 +466,7 @@ */ static class KdcAccessibility { @@ -5479,8 +5491,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2015-06-12 23:34:40.038230505 +0100 @@ -238,7 +238,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -5500,8 +5512,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2015-06-12 23:34:40.038230505 +0100 @@ -368,7 +368,7 @@ return null; } @@ -5520,10 +5532,22 @@ // 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 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java 2015-06-12 23:35:05.933778969 +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 + // the chain +- Set<Certificate> set = new HashSet<>(Arrays.asList(certChain)); ++ Set<Certificate> set = new HashSet<Certificate>(Arrays.asList(certChain)); + return set.size() == certChain.length; + } + 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2015-01-30 03:30:15.897326158 +0000 -@@ -584,7 +584,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2015-06-12 23:34:40.038230505 +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 // between the delegated self-issued certificate and its issuer. @@ -5533,8 +5557,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2015-06-12 23:34:40.038230505 +0100 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -5545,8 +5569,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2015-06-12 23:34:40.038230505 +0100 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -5602,8 +5626,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2015-06-12 23:34:40.038230505 +0100 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -5614,8 +5638,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2015-06-12 23:34:40.038230505 +0100 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -5626,44 +5650,54 @@ 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2015-01-30 03:30:15.897326158 +0000 -@@ -409,10 +409,10 @@ - parseX509orPKCS7Cert(InputStream is) - throws CertificateException, IOException - { +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2015-06-12 23:34:40.038230505 +0100 +@@ -431,7 +431,7 @@ + int peekByte; + byte[] data; + PushbackInputStream pbis = new PushbackInputStream(is); - Collection<X509CertImpl> coll = new ArrayList<>(); + Collection<X509CertImpl> coll = new ArrayList<X509CertImpl>(); - byte[] data = readOneBlock(is); - if (data == null) { + + // Test the InputStream for end-of-stream. If the stream's + // initial state is already at end-of-stream then return +@@ -439,7 +439,7 @@ + // stream and let readOneBlock look for the first certificate. + peekByte = pbis.read(); + if (peekByte == -1) { - return new ArrayList<>(0); + return new ArrayList<Certificate>(0); - } - try { - PKCS7 pkcs7 = new PKCS7(data); -@@ -422,7 +422,7 @@ + } else { + pbis.unread(peekByte); + data = readOneBlock(pbis); +@@ -459,7 +459,7 @@ return Arrays.asList(certs); } else { - // no crls provided + // no certificates provided - return new ArrayList<>(0); + return new ArrayList<Certificate>(0); } } catch (ParsingException e) { while (data != null) { -@@ -442,10 +442,10 @@ - parseX509orPKCS7CRL(InputStream is) - throws CRLException, IOException - { +@@ -482,7 +482,7 @@ + int peekByte; + byte[] data; + PushbackInputStream pbis = new PushbackInputStream(is); - Collection<X509CRLImpl> coll = new ArrayList<>(); + Collection<X509CRLImpl> coll = new ArrayList<X509CRLImpl>(); - byte[] data = readOneBlock(is); - if (data == null) { + + // Test the InputStream for end-of-stream. If the stream's + // initial state is already at end-of-stream then return +@@ -490,7 +490,7 @@ + // stream and let readOneBlock look for the first CRL. + peekByte = pbis.read(); + if (peekByte == -1) { - return new ArrayList<>(0); -+ return new ArrayList<java.security.cert.CRL>(0); - } - try { - PKCS7 pkcs7 = new PKCS7(data); -@@ -455,7 +455,7 @@ ++ return new ArrayList<CRL>(0); + } else { + pbis.unread(peekByte); + data = readOneBlock(pbis); +@@ -510,7 +510,7 @@ return Arrays.asList(crls); } else { // no crls provided @@ -5673,8 +5707,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2015-06-12 23:34:40.038230505 +0100 @@ -57,7 +57,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -5685,8 +5719,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2015-06-12 23:34:40.038230505 +0100 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -5697,8 +5731,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2015-01-30 03:30:15.897326158 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2015-06-12 23:34:40.038230505 +0100 @@ -397,7 +397,7 @@ // Map BulkCipher -> Boolean(available) @@ -5709,9 +5743,9 @@ // 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2015-01-30 03:30:15.901326207 +0000 -@@ -726,7 +726,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2015-06-12 23:34:40.038230505 +0100 +@@ -730,7 +730,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -5720,7 +5754,7 @@ for (int i = 0; i < certRequest.types.length; i++) { String typeName; -@@ -1267,7 +1267,7 @@ +@@ -1271,7 +1271,7 @@ "Can't reuse existing SSL client session"); } @@ -5729,7 +5763,7 @@ cipherList.add(sessionSuite); if (!secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { -@@ -1285,7 +1285,7 @@ +@@ -1289,7 +1289,7 @@ // exclude SCSV for secure renegotiation if (secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { Collection<CipherSuite> cipherList = @@ -5748,8 +5782,8 @@ subAltDnsNames.add(subAltDnsName); } 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2015-06-12 23:34:40.042230435 +0100 @@ -260,7 +260,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -5787,8 +5821,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 2015-01-30 03:29:05.148457201 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2015-01-30 03:30:33.801546055 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2015-06-12 23:14:47.203405219 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2015-06-12 23:34:40.042230435 +0100 @@ -592,7 +592,7 @@ activeProtocols = getActiveProtocols(); } @@ -5808,8 +5842,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 2015-01-30 03:28:57.428362377 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2015-06-12 23:14:44.775448940 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2015-06-12 23:34:40.042230435 +0100 @@ -169,7 +169,7 @@ return name; } @@ -5829,8 +5863,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2015-06-12 23:34:40.042230435 +0100 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -5841,8 +5875,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 2015-01-30 03:54:49.607378342 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2015-01-30 03:55:04.195557005 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java 2015-06-12 23:34:40.042230435 +0100 @@ -106,7 +106,7 @@ // Initialize the available protocols. @@ -5853,8 +5887,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2015-06-12 23:34:40.042230435 +0100 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -5892,8 +5926,8 @@ for (SignatureAndHashAlgorithm sigAlg : algorithms) { if (sigAlg.hash.value > 0) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2015-06-12 23:34:40.042230435 +0100 @@ -269,7 +269,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -5940,8 +5974,8 @@ if(cipherSuite.keyExchange != null) { components.addAll( 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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2015-01-30 03:53:58.434751621 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2015-06-12 23:34:40.042230435 +0100 @@ -327,7 +327,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -5979,8 +6013,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2015-06-12 23:34:40.042230435 +0100 @@ -642,7 +642,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -6000,8 +6034,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2015-06-12 23:34:40.042230435 +0100 @@ -2522,7 +2522,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -6012,8 +6046,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2015-06-12 23:34:40.042230435 +0100 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -6033,8 +6067,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2015-06-12 23:34:40.042230435 +0100 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -6045,8 +6079,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2015-01-30 03:30:15.901326207 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2015-06-12 23:34:40.042230435 +0100 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -6066,8 +6100,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2015-06-12 23:34:40.042230435 +0100 @@ -120,14 +120,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -6149,8 +6183,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 2015-01-30 03:29:05.560462260 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2015-06-12 23:14:47.243404498 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2015-06-12 23:34:40.046230365 +0100 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -6221,8 +6255,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2015-06-12 23:34:40.046230365 +0100 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -6260,8 +6294,8 @@ super(i, b); } 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 2015-01-30 03:29:05.560462260 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2015-06-12 23:14:47.243404498 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2015-06-12 23:34:40.046230365 +0100 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -6272,8 +6306,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2015-06-12 23:34:40.046230365 +0100 @@ -1253,7 +1253,7 @@ if (exts == null) { return null; @@ -6321,8 +6355,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2015-06-12 23:34:40.046230365 +0100 @@ -352,7 +352,7 @@ if (extensions == null) { return null; @@ -6351,8 +6385,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2015-06-12 23:34:40.046230365 +0100 @@ -104,8 +104,8 @@ private X500Principal issuerPrincipal = null; private Date thisUpdate = null; @@ -6383,8 +6417,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2015-06-12 23:34:40.046230365 +0100 @@ -95,7 +95,7 @@ * Run the converter */ @@ -6395,8 +6429,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2015-06-12 23:34:40.046230365 +0100 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -6511,8 +6545,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2015-01-30 03:30:15.905326257 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2015-06-12 23:34:40.046230365 +0100 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -6568,8 +6602,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2015-06-12 23:34:40.046230365 +0100 @@ -81,7 +81,7 @@ } @@ -6597,8 +6631,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2015-06-12 23:34:40.046230365 +0100 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -6635,8 +6669,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2015-06-12 23:34:40.050230296 +0100 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -6656,8 +6690,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2015-06-12 23:34:40.050230296 +0100 @@ -187,7 +187,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -6677,8 +6711,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2015-06-12 23:34:40.050230296 +0100 @@ -160,7 +160,7 @@ } @@ -6713,8 +6747,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2015-06-12 23:34:40.050230296 +0100 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -6727,8 +6761,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2015-06-12 23:34:40.050230296 +0100 @@ -134,7 +134,7 @@ throws IOException { @@ -6739,8 +6773,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2015-06-12 23:34:40.050230296 +0100 @@ -157,7 +157,7 @@ @Override @@ -6841,8 +6875,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2015-06-12 23:34:40.050230296 +0100 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -6853,8 +6887,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2015-06-12 23:34:40.050230296 +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. @@ -6865,8 +6899,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 2015-01-30 03:29:05.560462260 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2015-06-12 23:14:47.243404498 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2015-06-12 23:34:40.050230296 +0100 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -6931,8 +6965,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-06-12 23:34:40.050230296 +0100 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -6942,7 +6976,7 @@ try { BufferedReader in = -@@ -200,7 +200,7 @@ +@@ -209,7 +209,7 @@ // no local domain so try fallback (RPC) domain or // hostname @@ -6952,8 +6986,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2015-06-12 23:34:40.050230296 +0100 @@ -43,10 +43,10 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController { @@ -6968,8 +7002,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2015-06-12 23:34:40.050230296 +0100 @@ -133,7 +133,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); @@ -6980,8 +7014,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2015-06-12 23:34:40.050230296 +0100 @@ -136,7 +136,7 @@ // eventHigh needed when using file descriptors > 64k @@ -6992,8 +7026,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2015-06-12 23:34:40.050230296 +0100 @@ -67,7 +67,7 @@ fd1 = (int) pipeFds; pollWrapper = new EPollArrayWrapper(); @@ -7004,8 +7038,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2015-06-12 23:34:40.050230296 +0100 @@ -113,7 +113,7 @@ SocketAddress[] saa) { @@ -7016,8 +7050,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2015-06-12 23:34:40.050230296 +0100 @@ -153,12 +153,12 @@ static { @@ -7036,8 +7070,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2015-06-12 23:34:40.050230296 +0100 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -7057,8 +7091,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2015-01-30 03:30:15.909326305 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2015-06-12 23:34:40.050230296 +0100 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -7069,8 +7103,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2015-06-12 23:34:40.054230226 +0100 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -7081,8 +7115,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2015-06-12 23:34:40.054230226 +0100 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -7102,8 +7136,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2015-06-12 23:34:40.054230226 +0100 @@ -83,7 +83,7 @@ } @@ -7114,8 +7148,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2015-06-12 23:34:40.054230226 +0100 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -7126,8 +7160,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2015-06-12 23:34:40.054230226 +0100 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -7149,8 +7183,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2015-06-12 23:34:40.054230226 +0100 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -7161,8 +7195,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2015-06-12 23:34:40.054230226 +0100 @@ -128,7 +128,7 @@ } @@ -7173,8 +7207,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2015-06-12 23:34:40.054230226 +0100 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -7185,8 +7219,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2015-06-12 23:34:40.054230226 +0100 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -7197,8 +7231,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2015-06-12 23:34:40.054230226 +0100 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -7245,8 +7279,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2015-06-12 23:34:40.054230226 +0100 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -7257,8 +7291,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2015-06-12 23:34:40.054230226 +0100 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -7269,8 +7303,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2015-06-12 23:34:40.054230226 +0100 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -7281,8 +7315,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2015-06-12 23:34:40.054230226 +0100 @@ -103,7 +103,7 @@ } } @@ -7293,8 +7327,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2015-06-12 23:34:40.054230226 +0100 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -7305,8 +7339,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 2015-01-29 22:21:31.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2015-01-30 03:30:15.913326355 +0000 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2015-06-12 18:17:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2015-06-12 23:34:40.054230226 +0100 @@ -59,7 +59,7 @@ } }