Mercurial > hg > release > icedtea7-2.2
changeset 2542:9db4ba854770
Bump to jdk7u4 b13.
2012-05-02 Andrew John Hughes <ahughes@redhat.com>
Bump to jdk7u4 b13.
* Makefile.am:
(OPENJDK_VERSION): Set to b13.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_ENV): Set BUILD_CXX not BUILD_CPP
due to build-infra changes in HotSpot.
* patches/boot/ecj-diamond.patch:
Add cases in UntrustedCertificates.java.
* patches/boot/ecj-multicatch.patch: Likewise.
* patches/boot/ecj-trywithresources.patch: Likewise.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Thu, 03 May 2012 00:06:07 +0100 |
parents | f427c1c7d29c |
children | 70bfc9d0aa81 |
files | ChangeLog Makefile.am patches/boot/ecj-diamond.patch patches/boot/ecj-multicatch.patch patches/boot/ecj-trywithresources.patch |
diffstat | 5 files changed, 164 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Apr 23 21:10:12 2012 +0100 +++ b/ChangeLog Thu May 03 00:06:07 2012 +0100 @@ -1,3 +1,29 @@ +2012-05-02 Andrew John Hughes <ahughes@redhat.com> + + Bump to jdk7u4 b13. + * Makefile.am: + (OPENJDK_VERSION): Set to b13. + (CORBA_CHANGESET): Update to IcedTea7 forest head. + (HOTSPOT_CHANGESET): Likewise. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (ICEDTEA_ENV): Set BUILD_CXX not BUILD_CPP + due to build-infra changes in HotSpot. + * patches/boot/ecj-diamond.patch: + Add cases in UntrustedCertificates.java. + * patches/boot/ecj-multicatch.patch: Likewise. + * patches/boot/ecj-trywithresources.patch: Likewise. + 2012-04-23 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Mon Apr 23 21:10:12 2012 +0100 +++ b/Makefile.am Thu May 03 00:06:07 2012 +0100 @@ -1,24 +1,24 @@ # Dependencies -OPENJDK_VERSION = b147 +OPENJDK_VERSION = b13 JDK_UPDATE_VERSION = 04 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = c628aeb3d72f -HOTSPOT_CHANGESET = 2967c7838b7a -JAXP_CHANGESET = 9b7a2f21b8a8 -JAXWS_CHANGESET = 9ae185bd7ff2 -JDK_CHANGESET = 1aea8312412a -LANGTOOLS_CHANGESET = 54b1383d794c -OPENJDK_CHANGESET = 3a0fd3cc84a0 +CORBA_CHANGESET = 113893003a77 +HOTSPOT_CHANGESET = 5be91de8b779 +JAXP_CHANGESET = 10808c0ac008 +JAXWS_CHANGESET = 06cd92271215 +JDK_CHANGESET = 9b7558b91244 +LANGTOOLS_CHANGESET = 8634c8f95ff7 +OPENJDK_CHANGESET = 6670fad22684 -CORBA_SHA256SUM = b176cf1fd8a461413ab822236753cf455210e97c11a8d4224929582607c212b4 -HOTSPOT_SHA256SUM = ea07bbffa5ce566efa4f7955983315bee006b0e60f7eacb36d14710e5da61b58 -JAXP_SHA256SUM = 4d38e8a0fc0fcbe3ba8a56f9fc0960ecbf15cd4cef44b76fdc82418c008a33c3 -JAXWS_SHA256SUM = 60c6c62c851eafc15ff33e58aa625e6f58fd31f15328b121602a07891fc1d272 -JDK_SHA256SUM = 1d5f1b7a5d9f8be06105130aa1c0f1898e9b91fb8d968d7ccb21d2b365575802 -LANGTOOLS_SHA256SUM = 97821e49028d8d726fac9563c361c682146e037074179cbd68ed5cb80e82f9fa -OPENJDK_SHA256SUM = abe0c3b348c35f79117ef726bb2580b279024b1f73b6487fda4a1e717c738f9f +CORBA_SHA256SUM = 3dafae04c00c8f13a7cbba0a8ad070bd10e4bec6598f27a62e34cdeb54ed4957 +HOTSPOT_SHA256SUM = babb11cf54c6299fe2f0730968316958b71a1dd5e7c2d5d698ac7d905bfc2ccc +JAXP_SHA256SUM = a8c600e3419d8586acb3f7f444bea399aac174d58f2127cb4c0a3ffd3cffdd17 +JAXWS_SHA256SUM = f896fbc4dd9eeb68015afe0378638fc646b9b08047cf9c382a33542f44454def +JDK_SHA256SUM = a449701b9957e1993b4795b7825953eb806b5865a12b165cbcaf62887f83504f +LANGTOOLS_SHA256SUM = bad80067828740510fe8f7c430dfb90d1ec1c895a93fa56b16d8223a8c757bd3 +OPENJDK_SHA256SUM = 5256c8e7c9144ff8a23e83574a82a42874c4c7722057e8194ceb70fe15a5de06 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 @@ -427,7 +427,7 @@ VERBOSE="$(VERBOSE)" \ STATIC_CXX="false" \ BUILD_GCC="$(CC)" \ - BUILD_CPP="$(CXX)" \ + BUILD_CXX="$(CXX)" \ USE_SYSTEM_CUPS="true" \ CUPS_LIBS="${CUPS_LIBS}" \ CUPS_CFLAGS="${CUPS_CFLAGS}" \
--- a/patches/boot/ecj-diamond.patch Mon Apr 23 21:10:12 2012 +0100 +++ b/patches/boot/ecj-diamond.patch Thu May 03 00:06:07 2012 +0100 @@ -6030,3 +6030,15 @@ List<Thread> threads = new ArrayList<Thread>(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/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 2012-05-02 20:54:14.597408672 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-02 20:54:23.977558137 +0100 +@@ -42,7 +42,7 @@ + */ + public final class UntrustedCertificates { + +- private final static Set<X509Certificate> untrustedCerts = new HashSet<>(); ++ private final static Set<X509Certificate> untrustedCerts = new HashSet<X509Certificate>(); + + /** + * Checks if a certificate is untrusted.
--- a/patches/boot/ecj-multicatch.patch Mon Apr 23 21:10:12 2012 +0100 +++ b/patches/boot/ecj-multicatch.patch Thu May 03 00:06:07 2012 +0100 @@ -176,3 +176,18 @@ } private static String getMainClass(VirtualMachineDescriptor vmd) +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 2012-05-02 20:50:17.549643066 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-02 20:52:03.435320716 +0100 +@@ -65,7 +65,10 @@ + throw new RuntimeException("Duplicate untrusted certificate: " + + cert.getSubjectX500Principal()); + } +- } catch (CertificateException | IOException e) { ++ } catch (CertificateException e) { ++ throw new RuntimeException( ++ "Incorrect untrusted certificate: " + alias, e); ++ } catch (IOException e) { + throw new RuntimeException( + "Incorrect untrusted certificate: " + alias, e); + }
--- a/patches/boot/ecj-trywithresources.patch Mon Apr 23 21:10:12 2012 +0100 +++ b/patches/boot/ecj-trywithresources.patch Thu May 03 00:06:07 2012 +0100 @@ -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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-03-22 11:12:25.868603481 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-07-27 14:31:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-05-02 21:34:27.804140818 +0100 @@ -743,7 +743,9 @@ private void dumpBand() throws IOException { @@ -54,9 +54,9 @@ 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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-03-22 11:12:25.876603609 +0000 -@@ -151,8 +151,13 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-02 21:14:28.392759448 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-02 21:34:27.812140950 +0100 +@@ -149,8 +149,13 @@ if ("--config-file=".equals(state)) { String propFile = av.remove(0); Properties fileProps = new Properties(); @@ -71,7 +71,7 @@ } if (engProps.get(verboseProp) != null) fileProps.list(System.out); -@@ -348,9 +353,14 @@ +@@ -341,9 +346,14 @@ else fileOut = new FileOutputStream(outfile); fileOut = new BufferedOutputStream(fileOut); @@ -87,7 +87,7 @@ } // At this point, we have a good jarfile (or newfile, if -r) } -@@ -411,7 +421,9 @@ +@@ -404,7 +414,9 @@ long filelen = new File(jarfile).length(); if (filelen <= 0) return ""; long skiplen = Math.max(0, filelen - tail.length); @@ -98,7 +98,7 @@ in.skip(skiplen); in.read(tail); for (int i = tail.length-4; i >= 0; i--) { -@@ -425,6 +437,9 @@ +@@ -418,6 +430,9 @@ } } return ""; @@ -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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2011-07-27 14:31:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2012-05-02 21:34:27.812140950 +0100 @@ -241,9 +241,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-07-27 14:31:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-05-02 21:34:27.812140950 +0100 @@ -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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-07-27 14:31:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-05-02 21:34:27.816141016 +0100 @@ -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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-07-27 14:31:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-05-02 21:34:27.816141016 +0100 @@ -122,8 +122,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-07-27 14:31:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-05-02 21:34:27.816141016 +0100 @@ -160,9 +160,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-07-27 14:31:14.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-05-02 21:34:27.816141016 +0100 @@ -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/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2012-05-02 21:34:27.828141214 +0100 @@ -575,12 +575,23 @@ * Returns the Manifest for the specified JAR file name. */ @@ -335,8 +335,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2012-05-02 21:34:27.828141214 +0100 @@ -188,7 +188,7 @@ } catch (Throwable suppressed) { x.addSuppressed(suppressed); @@ -347,8 +347,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2011-04-29 01:51:17.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2012-05-02 21:34:27.828141214 +0100 @@ -122,9 +122,15 @@ if (attrs.isDirectory()) { Files.createDirectory(target); @@ -376,8 +376,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2012-05-02 21:34:27.832141280 +0100 @@ -2833,8 +2833,11 @@ } @@ -491,8 +491,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2012-03-18 17:19:55.667662249 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2012-05-02 21:34:27.832141280 +0100 @@ -233,9 +233,14 @@ "currency.properties"); if (propFile.exists()) { @@ -510,8 +510,8 @@ Pattern propertiesPattern = Pattern.compile("([A-Z]{3})\\s*,\\s*(\\d{3})\\s*,\\s*([0-3])"); 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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2012-03-22 11:12:25.876603609 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2012-05-02 21:34:27.832141280 +0100 @@ -376,9 +376,15 @@ */ private byte[] getBytes(ZipEntry ze) throws IOException { @@ -549,8 +549,8 @@ int i = 0; next: 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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2012-05-02 21:34:27.832141280 +0100 @@ -144,8 +144,9 @@ buf = new char[(int)len]; int read = 0; @@ -610,8 +610,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2012-05-02 21:34:27.832141280 +0100 @@ -367,9 +367,15 @@ // Load user's implementation of SyncProvider // here. -Drowset.properties=/abc/def/pqr.txt @@ -654,8 +654,8 @@ parseProperties(properties); 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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2012-05-02 21:34:27.832141280 +0100 @@ -194,7 +194,8 @@ * Given a URL, retrieves a JAR file, caches it to disk, and creates a * cached JAR file object. @@ -689,8 +689,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2012-05-02 21:34:27.832141280 +0100 @@ -255,7 +255,9 @@ this.entries = new HashMap<Path,CacheEntry>(); @@ -714,8 +714,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-05-02 21:34:27.832141280 +0100 @@ -92,9 +92,13 @@ tabName = filename; try { @@ -784,8 +784,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2012-05-02 21:34:27.832141280 +0100 @@ -179,7 +179,9 @@ // The temporary dir File f = new File(p.getProperty("java.io.tmpdir")); @@ -809,8 +809,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 2012-03-21 23:42:03.534014791 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-03-22 12:45:19.286744673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-03-18 17:19:55.719663080 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-05-02 21:34:27.832141280 +0100 @@ -1149,9 +1149,14 @@ } else { ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -828,9 +828,44 @@ } } } +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 2012-05-02 21:14:28.512761362 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-02 21:34:27.836141346 +0100 +@@ -56,8 +56,9 @@ + + private static void add(String alias, String pemCert) { + // generate certificate from PEM certificate +- try (ByteArrayInputStream is = +- new ByteArrayInputStream(pemCert.getBytes())) { ++ ByteArrayInputStream is = null; ++ try { ++ is = new ByteArrayInputStream(pemCert.getBytes()); + CertificateFactory cf = CertificateFactory.getInstance("X.509"); + X509Certificate cert = (X509Certificate)cf.generateCertificate(is); + +@@ -68,10 +69,15 @@ + } catch (CertificateException e) { + throw new RuntimeException( + "Incorrect untrusted certificate: " + alias, e); +- } catch (IOException e) { +- throw new RuntimeException( +- "Incorrect untrusted certificate: " + alias, e); +- } ++ } finally { ++ try { ++ if (is != null) ++ is.close(); ++ } catch (IOException e) { ++ throw new RuntimeException( ++ "Incorrect untrusted certificate: " + alias, e); ++ } ++ } + } + + static { 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 2012-03-22 06:00:16.274401878 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2012-03-22 09:57:58.951418314 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2012-03-18 17:19:55.723663143 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2012-05-02 21:34:27.832141280 +0100 @@ -99,14 +99,19 @@ } @@ -860,9 +895,9 @@ 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 2012-03-22 06:00:16.249674555 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2012-03-22 09:59:25.594209042 +0000 -@@ -142,7 +142,9 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2012-05-02 21:14:28.508761298 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2012-05-02 21:34:27.832141280 +0100 +@@ -153,7 +153,9 @@ // Cast to HotSpotVirtualMachine as this is an // implementation specific method. HotSpotVirtualMachine hvm = (HotSpotVirtualMachine) vm; @@ -873,7 +908,7 @@ // read to EOF and just print output byte b[] = new byte[256]; int n; -@@ -153,7 +155,10 @@ +@@ -164,7 +166,10 @@ System.out.print(s); } } while (n > 0); @@ -886,8 +921,8 @@ } 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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2012-05-02 21:34:27.832141280 +0100 @@ -127,9 +127,15 @@ calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws IOException { @@ -906,8 +941,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2012-02-13 15:55:48.725932524 +0000 ++++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2012-05-02 21:34:27.832141280 +0100 @@ -200,7 +200,7 @@ } @@ -918,8 +953,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-05-02 21:34:27.832141280 +0100 @@ -569,11 +569,11 @@ public Void run() throws BackingStoreException { Map<String, String> m = new TreeMap<>(); @@ -983,8 +1018,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 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2012-03-22 11:12:25.880603673 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2012-05-02 21:34:27.832141280 +0100 @@ -255,9 +255,16 @@ String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties"; Path file = Paths.get(fstypes);