Mercurial > hg > icedtea7
changeset 2849:bffa3455fa17 icedtea-2.7.0pre04
Bump to icedtea-2.7.0pre04.
Upstream changes:
- Bump to icedtea-2.7.0pre04
- S6880559, PR2674: Enable PKCS11 64-bit windows builds
- S6904403, PR2674: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
- S7011441, PR2674: jndi/ldap/Connection.java needs to avoid spurious wakeup
- S7059542, PR2674: JNDI name operations should be locale independent
- S7107611, PR2674: sun.security.pkcs11.SessionManager is scalability blocker
- S7127066, PR2674: Class verifier accepts an invalid class file
- S7150092, PR2674: NTLM authentication fail if user specified a different realm
- S7152582, PR2674: PKCS11 tests should use the NSS libraries available in the OS
- S7156085, PR2674: ArrayIndexOutOfBoundsException throws in UTF8Reader of SAXParser
- S7177045, PR2674: Rework the TestProviderLeak.java regression test, it is too fragile to low memory errors.
- S7190945, PR2674: pkcs11 problem loading NSS libs on Ubuntu
- S8005226, PR2674: java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java fails intermittently
- S8009438, PR2674: sun/security/pkcs11/Secmod tests failing on Ubuntu 12.04
- S8012971, PR2674: PKCS11Test hiding exception failures
- S8020424, PR2674: The NSS version should be detected before running crypto tests
- S8020443, PR2674: Frame is not created on the specified GraphicsDevice with two monitors
- S8026119. PR2679: Regression test DHEKeySizing.java failing intermittently
- S8027624, PR2674: com/sun/crypto/provider/KeyFactory/TestProviderLeak.java unstable again
- S8033069, PR2674: mouse wheel scroll closes combobox popup
- S8035150, PR2674: ShouldNotReachHere() in ConstantPool::copy_entry_to
- S8039212, PR2674: SecretKeyBasic.sh needs to avoid NSS libnss3 and libsoftokn3 version mismatches
- S8044364, PR2674: runtime/RedefineFinalizer test fails on windows
- S8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
- S8050123, PR2674: Incorrect property name documented in CORBA InputStream API
- S8056124, PR2674: Hotspot should use PICL interface to get cacheline size on SPARC
- S8059200, PR2674: Promoted JDK9 b31 for Solaris-amd64 fails (Error: dl failure on line 744, no picl library) on Solaris 11.1
- S8059588, PR2674: deadlock in java/io/PrintStream when verbose java.security.debug flags are set
- S8062518, PR2674: AIOBE occurs when accessing to document function in extended function in JAXP
- S8062591, PR2674: SPARC PICL causes significantly longer startup times
- S8072863, PR2674: Replace fatal() with vm_exit_during_initialization() when an incorrect class is found on the bootclasspath
- S8073453, PR2674: Focus doesn't move when pressing Shift + Tab keys
- S8074350, PR2674: Support ISO 4217 "Current funds codes" table (A.2)
- S8074869, PR2674: C2 code generator can replace -0.0f with +0.0f on Linux
- S8075609, PR2674: java.lang.IllegalArgumentException: aContainer is not a focus cycle root of aComponent
- S8075773, PR2674: jps running as root fails after the fix of JDK-8050807
- S8076040, PR2674: Test com/sun/crypto/provider/KeyFactory/TestProviderLeak.java fails with -XX:+UseG1GC
- S8076328, PR2679: Enforce key exchange constraints
- S8076455, PR2674: IME Composition Window is displayed on incorrect position
- S8076968, PR2674: PICL based initialization of L2 cache line size on some SPARC systems is incorrect
- S8077102, PR2674: dns_lookup_realm should be false by default
- S8077409, PR2674: Drawing deviates when validate() is invoked on java.awt.ScrollPane
- S8078113, PR2674: 8011102 changes may cause incorrect results
- S8080012, PR2674: JVM times out with vdbench on SPARC M7-16
- S8081392, PR2674: getNodeValue should return 'null' value for Element nodes
- S8081470, PR2674: com/sun/jdi tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12
- S8081760, PR2679: Better group dynamics
- S8130297, PR2674: com/sun/crypto/provider/KeyFactory/TestProviderLeak.java still failing after JDK-8076040
- S8133636, PR2674: [TEST_BUG] Import/add tests for the problem seen in 8076110
2015-11-20 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am,
(CORBA_CHANGESET): Update to icedtea-2.7.0pre04.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.7.0pre04.
* hotspot.map.in: Update to icedtea-2.7.0pre04.
* patches/boot/ecj-stringswitch.patch:
Add new case in sun.security.krb.Config.
* patches/boot/ecj-trywithresources.patch:
Regenerated due to changes in java.util.Currency.
* patches/boot/ecj-underscored_literals.patch:
Add new case in com.sun.jndi.ldap.Connection.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 23 Nov 2015 02:54:31 +0000 |
| parents | a3532bae11d5 |
| children | d44ea9fb2df8 |
| files | ChangeLog Makefile.am configure.ac hotspot.map.in patches/boot/ecj-stringswitch.patch patches/boot/ecj-trywithresources.patch patches/boot/ecj-underscored_literals.patch |
| diffstat | 7 files changed, 149 insertions(+), 89 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 20 01:08:53 2015 +0000 +++ b/ChangeLog Mon Nov 23 02:54:31 2015 +0000 @@ -1,3 +1,28 @@ +2015-11-20 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am, + (CORBA_CHANGESET): Update to icedtea-2.7.0pre04. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.7.0pre04. + * hotspot.map.in: Update to icedtea-2.7.0pre04. + * patches/boot/ecj-stringswitch.patch: + Add new case in sun.security.krb.Config. + * patches/boot/ecj-trywithresources.patch: + Regenerated due to changes in java.util.Currency. + * patches/boot/ecj-underscored_literals.patch: + Add new case in com.sun.jndi.ldap.Connection. + 2015-11-19 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: Add 2.6.2 and 2.6.3 release notes.
--- a/Makefile.am Fri Nov 20 01:08:53 2015 +0000 +++ b/Makefile.am Mon Nov 23 02:54:31 2015 +0000 @@ -4,19 +4,19 @@ BUILD_VERSION = b02 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = da5abda100e8 -JAXP_CHANGESET = 10d0204f4318 -JAXWS_CHANGESET = eb23ce90740d -JDK_CHANGESET = dbb972937b50 -LANGTOOLS_CHANGESET = e5daf5b722d5 -OPENJDK_CHANGESET = 8a0021f6f237 - -CORBA_SHA256SUM = d0c8582b7a283e3e991e967328c0a1e67e0823e32b3f98ae37f6592b8e3129f1 -JAXP_SHA256SUM = 83de7a2cd3b1b83b954b057217f3463490be0d171962e6627257401fe9b9b0b1 -JAXWS_SHA256SUM = 3413149a17409e827900424b8d92728aaff2384e5a872ded87f25111138da32d -JDK_SHA256SUM = 9e847e0a00155860e6623fe742da3b60f98cd6daeb2187cee283759ba2206773 -LANGTOOLS_SHA256SUM = 7c60d17a2cb72acf3ad4c2d76eb6e7217a0651474fbfe0242f1a1456eb536e93 -OPENJDK_SHA256SUM = 9a073f2f11e93307d5af1505482ecec3af09e8408a2d0f8a80d83c6857afcb60 +CORBA_CHANGESET = 52740a0992cf +JAXP_CHANGESET = 3cc8e02e66bc +JAXWS_CHANGESET = ffef9af0446a +JDK_CHANGESET = 91216176dcc7 +LANGTOOLS_CHANGESET = e15dd34800b5 +OPENJDK_CHANGESET = 613ca59d428d + +CORBA_SHA256SUM = d8cfca4bd056e0cdd3a69c9f2c13f5815ece29eabf791e7c1f798d3c31d24a0f +JAXP_SHA256SUM = a621b407bd3b96e3d676c2e7d2358607dfe54fc97197b578d301c662f632e4e6 +JAXWS_SHA256SUM = bd2931f7c909160124b59c1f1b723930140741a5d3c9793330b8a391189fe461 +JDK_SHA256SUM = e72e00a3a311f3daeaefc23d2b11ea183fee4f0e1e431c12c9187c80d4ab330a +LANGTOOLS_SHA256SUM = 03672c1c6e8c3a46c4f981821d45075c7c53facec3029728fbbea3fba094c69c +OPENJDK_SHA256SUM = 492a567851ac54bcf93dae182d8421178b20b9d613b00254ff409e7a8587486a DROP_URL = http://icedtea.classpath.org/download/drops
--- a/configure.ac Fri Nov 20 01:08:53 2015 +0000 +++ b/configure.ac Mon Nov 23 02:54:31 2015 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.7.0pre03], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.7.0pre04], [distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile])
--- a/hotspot.map.in Fri Nov 20 01:08:53 2015 +0000 +++ b/hotspot.map.in Mon Nov 23 02:54:31 2015 +0000 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 193c9550e6f7 75f5edfe9fd848db3232c3c90ced86cbadda9e85288f184dd358592c18370724 +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 43c066bdfc9f d5bbe93d241cb8ca92649cc8b3a19952a7fc4217d33a3df80b18894c58bd52f1
--- a/patches/boot/ecj-stringswitch.patch Fri Nov 20 01:08:53 2015 +0000 +++ b/patches/boot/ecj-stringswitch.patch Mon Nov 23 02:54:31 2015 +0000 @@ -606,3 +606,24 @@ } lib = replace(k, lib, "$ARCH", arch); } +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2015-10-20 02:20:59.588588403 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2015-10-20 02:22:51.051758602 +0100 +@@ -420,14 +420,13 @@ + if (s == null) { + return null; + } +- switch (s.toLowerCase(Locale.US)) { +- case "yes": case "true": ++ String lCase = s.toLowerCase(Locale.US); ++ if ("yes".equals(lCase) || "true".equals(lCase)) { + return Boolean.TRUE; +- case "no": case "false": ++ } else if ("no".equals(lCase) || "false".equals(lCase)) { + return Boolean.FALSE; +- default: +- return null; + } ++ return null; + } + + /**
--- a/patches/boot/ecj-trywithresources.patch Fri Nov 20 01:08:53 2015 +0000 +++ b/patches/boot/ecj-trywithresources.patch Mon Nov 23 02:54:31 2015 +0000 @@ -1,6 +1,6 @@ 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-09-08 10:38:32.090285128 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-11-21 04:01:44.049911644 +0000 @@ -743,7 +743,9 @@ private void dumpBand() throws IOException { @@ -54,8 +54,8 @@ public void readDataFrom(InputStream in) throws IOException { 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-09-08 10:36:19.396726077 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-09-08 10:38:32.090285128 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-11-20 05:14:27.699509574 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-11-21 04:01:44.049911644 +0000 @@ -151,8 +151,13 @@ if ("--config-file=".equals(state)) { String propFile = av.remove(0); @@ -109,8 +109,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2015-09-08 10:38:32.090285128 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2015-11-21 04:01:44.049911644 +0000 @@ -245,9 +245,15 @@ void run(File inFile, JarOutputStream jstream) throws IOException { // %%% maybe memory-map the file, and pass it straight into unpacker @@ -129,8 +129,8 @@ } 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-09-08 10:38:32.090285128 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-11-21 04:01:44.049911644 +0000 @@ -540,9 +540,15 @@ Index index = initCPIndex(tag, cpMap); @@ -174,8 +174,8 @@ attr_definition_name.doneDisbursing(); attr_definition_layout.doneDisbursing(); 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-11-21 04:01:44.053911577 +0000 @@ -458,9 +458,15 @@ Utils.log.info("Writing "+cpMap.length+" "+ConstantPool.tagName(tag)+" entries..."); @@ -219,8 +219,8 @@ void writeAttrCounts() throws IOException { 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-11-21 04:01:44.053911577 +0000 @@ -123,8 +123,9 @@ // Do this after the previous props are put in place, // to allow override if necessary. @@ -249,8 +249,8 @@ for (Map.Entry<Object, Object> e : props.entrySet()) { String key = (String) e.getKey(); 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-11-21 04:01:44.053911577 +0000 @@ -161,9 +161,15 @@ } // Use the stream-based implementation. @@ -269,8 +269,8 @@ in.delete(); } 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-11-21 04:01:44.053911577 +0000 @@ -268,18 +268,30 @@ // 4947205 : Peformance is slow when using pack-effort=0 out = new BufferedOutputStream(out); @@ -305,8 +305,8 @@ // Wrapper to prevent closing of client-supplied stream. static private 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2015-11-21 04:01:44.053911577 +0000 @@ -912,10 +912,15 @@ java.net.URLConnection uconn = tClass.getResource(tResource).openConnection(); int len = uconn.getContentLength(); @@ -326,8 +326,8 @@ } catch (java.io.IOException ex) { throw newInternalError(ex); 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2015-11-21 04:01:44.053911577 +0000 @@ -578,12 +578,23 @@ * Returns the Manifest for the specified JAR file name. */ @@ -356,8 +356,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java ---- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2015-11-21 04:01:44.053911577 +0000 @@ -188,7 +188,7 @@ } catch (Throwable suppressed) { x.addSuppressed(suppressed); @@ -368,8 +368,8 @@ assert sc.isConnected(); return sc; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2015-11-21 04:01:44.053911577 +0000 @@ -122,9 +122,15 @@ if (attrs.isDirectory()) { Files.createDirectory(target); @@ -397,8 +397,8 @@ } } 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2015-11-21 04:01:44.053911577 +0000 @@ -2850,8 +2850,11 @@ } @@ -526,9 +526,9 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java openjdk-boot/jdk/src/share/classes/java/util/Currency.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2015-09-08 10:38:32.094285055 +0100 -@@ -235,9 +235,14 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2015-11-21 04:02:23.585245874 +0000 +@@ -237,9 +237,14 @@ "currency.properties"); if (propFile.exists()) { Properties props = new Properties(); @@ -543,10 +543,10 @@ + } Set<String> keys = props.stringPropertyNames(); Pattern propertiesPattern = - Pattern.compile("([A-Z]{3})\\s*,\\s*(\\d{3})\\s*,\\s*([0-3])"); + Pattern.compile("([A-Z]{3})\\s*,\\s*(\\d{3})\\s*,\\s*(\\d+)"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2015-09-08 10:38:32.094285055 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2015-11-21 04:01:44.057911510 +0000 @@ -386,9 +386,14 @@ * META-INF files. */ @@ -565,8 +565,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2015-11-21 04:01:44.057911510 +0000 @@ -144,8 +144,9 @@ buf = new char[(int)len]; int read = 0; @@ -626,8 +626,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2015-11-21 04:01:44.057911510 +0000 @@ -382,9 +382,15 @@ // Load user's implementation of SyncProvider // here. -Drowset.properties=/abc/def/pqr.txt @@ -678,8 +678,8 @@ } catch (PrivilegedActionException ex) { Throwable e = ex.getException(); 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-09-08 10:36:19.396726077 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2015-11-20 05:14:27.703509505 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2015-11-21 04:01:44.057911510 +0000 @@ -555,8 +555,9 @@ if (parent == null) { parent = new File("."); @@ -703,8 +703,8 @@ } else { out.add(a.arg); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2015-11-21 04:01:44.057911510 +0000 @@ -194,7 +194,8 @@ * Given a URL, retrieves a JAR file, caches it to disk, and creates a * cached JAR file object. @@ -738,8 +738,8 @@ } }); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2015-11-21 04:01:44.057911510 +0000 @@ -255,7 +255,9 @@ this.entries = new HashMap<Path,CacheEntry>(); @@ -763,8 +763,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java 2015-11-21 04:01:44.057911510 +0000 @@ -680,25 +680,38 @@ private void handleProcessFailure(final Process failedProcess, @@ -811,8 +811,8 @@ public Object run() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2015-11-21 04:01:44.057911510 +0000 @@ -594,10 +594,16 @@ } else { name = versionFile; @@ -851,8 +851,8 @@ /** 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2015-09-08 10:38:32.098284981 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2015-11-21 04:01:44.057911510 +0000 @@ -1233,13 +1233,16 @@ PipeWriter.plugTogetherPair (child.getInputStream(), System.out, @@ -874,8 +874,8 @@ } catch (IOException e) { 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-09-08 10:36:19.564722983 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2015-11-20 05:14:27.959505128 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2015-11-21 04:01:44.057911510 +0000 @@ -233,13 +233,14 @@ proxyLog.log(Log.BRIEF, "trying with factory: " + factory); @@ -905,8 +905,8 @@ // factory succeeded, open new socket for caller's use 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2015-11-21 04:01:44.057911510 +0000 @@ -159,18 +159,33 @@ throws IOException, KrbException { primaryPrincipal = principal; @@ -990,8 +990,8 @@ } 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2015-11-21 04:01:44.057911510 +0000 @@ -92,9 +92,13 @@ tabName = filename; try { @@ -1060,8 +1060,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2015-11-21 04:01:44.061911442 +0000 @@ -179,7 +179,9 @@ // The temporary dir File f = new File(p.getProperty("java.io.tmpdir")); @@ -1085,8 +1085,8 @@ } catch (Exception ex) { md.update((byte)ex.hashCode()); 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2015-11-21 04:01:44.061911442 +0000 @@ -1149,9 +1149,14 @@ } else { ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -1105,8 +1105,8 @@ } } 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-09-08 10:36:19.564722983 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2015-09-08 10:39:51.088834619 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2015-11-20 05:14:27.963505061 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2015-11-21 04:01:44.061911442 +0000 @@ -56,8 +56,9 @@ private static void add(String alias, String pemCert) { @@ -1138,8 +1138,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2015-11-21 04:01:44.061911442 +0000 @@ -99,14 +99,19 @@ } @@ -1169,8 +1169,8 @@ public static void usage() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2015-09-08 10:36:19.568722910 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2015-11-20 05:14:27.963505061 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2015-11-21 04:01:44.061911442 +0000 @@ -158,7 +158,9 @@ if (line.trim().equals("stop")) { break; @@ -1193,8 +1193,8 @@ } vm.detach(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2015-11-21 04:01:44.061911442 +0000 @@ -127,9 +127,15 @@ calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws IOException { @@ -1213,8 +1213,8 @@ } }); diff -Nru openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java ---- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2015-11-21 04:01:44.061911442 +0000 @@ -200,7 +200,7 @@ } @@ -1225,8 +1225,8 @@ Character.UnicodeBlock currentBlock = Character.UnicodeBlock.of(0); for (int cp = 0x000001; cp < 0x110000; cp++ ) { 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-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2015-11-21 04:01:44.061911442 +0000 @@ -569,11 +569,11 @@ public Void run() throws BackingStoreException { Map<String, String> m = new TreeMap<>(); @@ -1290,8 +1290,8 @@ } }); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2015-09-08 10:38:32.102284908 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2015-11-21 04:01:44.061911442 +0000 @@ -255,9 +255,16 @@ String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties"; Path file = Paths.get(fstypes); @@ -1311,8 +1311,8 @@ } return result; diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2015-07-31 14:21:55.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2015-09-08 10:38:32.106284834 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2015-07-23 09:51:31.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2015-11-21 04:01:44.061911442 +0000 @@ -960,25 +960,38 @@ private void handleProcessFailure(final Process failedProcess,
--- a/patches/boot/ecj-underscored_literals.patch Fri Nov 20 01:08:53 2015 +0000 +++ b/patches/boot/ecj-underscored_literals.patch Mon Nov 23 02:54:31 2015 +0000 @@ -9,3 +9,17 @@ return (int) ell; } else { throw new +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java 2015-10-19 08:58:37.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java 2015-10-20 02:41:38.769878548 +0100 +@@ -471,8 +471,8 @@ + // available + ldr.wait(readTimeout - elapsedMilli); + elapsedNano += (System.nanoTime() - beginNano); +- elapsedMilli += elapsedNano / 1000_000; +- elapsedNano %= 1000_000; ++ elapsedMilli += elapsedNano / 1000000; ++ elapsedNano %= 1000000; + + } else { + // no timeout is set so we wait infinitely until