Mercurial > hg > release > icedtea7-2.0
changeset 2445:7ca2cb0df928
Bump to b143.
2011-06-24 Andrew John Hughes <ahughes@redhat.com>
* patches/rmi_amd64.patch:
Removed, upsteam (OpenJDK).
* patches/testenv.patch:
Removed, upstream (IcedTea forest).
* Makefile.am:
(OPENJDK_VERSION): Bumped to b143.
(CORBA_CHANGESET): Updated.
(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.
(JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise.
(JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Drop rmi_amd64 and testenv patch.
* generated/sun/nio/ch/SocketOptionRegistry.java:
Use version from latest build.
* patches/boot/ecj-autoboxing.patch,
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-multicatch.patch,
* patches/boot/ecj-trywithresources.patch:
Extended with new cases introduced since b136.
* patches/boot/jar.patch:
Recreated against b143.
* patches/boot/revert-6941137.patch:
Updated for b143.
* patches/boot/symbols.patch: Likewise.
* patches/libraries.patch: Likewise.
* patches/linker-libs-order.patch: Likewise.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 24 Jun 2011 19:07:40 +0100 |
| parents | 53d922289489 |
| children | 2e7eaebf5cc9 |
| files | ChangeLog Makefile.am generated/sun/nio/ch/SocketOptionRegistry.java patches/boot/ecj-autoboxing.patch patches/boot/ecj-diamond.patch patches/boot/ecj-multicatch.patch patches/boot/ecj-trywithresources.patch patches/boot/jar.patch patches/boot/revert-6941137.patch patches/boot/symbols.patch patches/libraries.patch patches/linker-libs-order.patch patches/rmi_amd64.patch patches/testenv.patch |
| diffstat | 14 files changed, 1253 insertions(+), 653 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 06 15:30:31 2011 +0200 +++ b/ChangeLog Fri Jun 24 19:07:40 2011 +0100 @@ -1,3 +1,45 @@ +2011-06-24 Andrew John Hughes <ahughes@redhat.com> + + * patches/rmi_amd64.patch: + Removed, upsteam (OpenJDK). + * patches/testenv.patch: + Removed, upstream (IcedTea forest). + * Makefile.am: + (OPENJDK_VERSION): Bumped to b143. + (CORBA_CHANGESET): Updated. + (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. + (JAXWS_DROP_ZIP): Likewise. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Drop rmi_amd64 and testenv patch. + * generated/sun/nio/ch/SocketOptionRegistry.java: + Use version from latest build. + * patches/boot/ecj-autoboxing.patch, + * patches/boot/ecj-diamond.patch, + * patches/boot/ecj-multicatch.patch, + * patches/boot/ecj-trywithresources.patch: + Extended with new cases introduced since b136. + * patches/boot/jar.patch: + Recreated against b143. + * patches/boot/revert-6941137.patch: + Updated for b143. + * patches/boot/symbols.patch: Likewise. + * patches/libraries.patch: Likewise. + * patches/linker-libs-order.patch: Likewise. + 2011-06-06 Pavel Tisnovsky <ptisnovs@redhat.com> * Makefile.am:
--- a/Makefile.am Mon Jun 06 15:30:31 2011 +0200 +++ b/Makefile.am Fri Jun 24 19:07:40 2011 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b136 +OPENJDK_VERSION = b143 -CORBA_CHANGESET = b62418551e20 -HOTSPOT_CHANGESET = 591c7dc0b2ee -JAXP_CHANGESET = 1c2f25bf36b1 -JAXWS_CHANGESET = 339c2d381d80 -JDK_CHANGESET = 1571aa7abe47 -LANGTOOLS_CHANGESET = 8e26c4aee63c -OPENJDK_CHANGESET = d4aea1a51d62 +CORBA_CHANGESET = 279c876d1001 +HOTSPOT_CHANGESET = b8227c320dec +JAXP_CHANGESET = d8cdc48a42bd +JAXWS_CHANGESET = e514ae6ec042 +JDK_CHANGESET = d28f54a421b1 +LANGTOOLS_CHANGESET = 1316e51b3995 +OPENJDK_CHANGESET = 2108c94c0d3d -CORBA_SHA256SUM = 734085b7c91240bce89f0fc28f29b1bbe9b41da706ad0230fe341b5effbd2554 -HOTSPOT_SHA256SUM = bbc9cdefbb0811f9b7b7006c69cff64bbbe067a6762c49000fdb2ae29e6e610e -JAXP_SHA256SUM = b980bd552f421a2560257f67358ea2adc68556accd719cac0c7980259e13b460 -JAXWS_SHA256SUM = 32507d9499987b92e88a036dd6e3784acf4ebec74902891c87a0db05ffe375f5 -JDK_SHA256SUM = b2a7d77a0807f79dd1569160549cc8038696fbce506f916fe9ea6f02eb514f0c -LANGTOOLS_SHA256SUM = 8bb857b59ea2ffd7421bc91bbeb9c99831827a2119a3479c119a6a20ceba4b07 -OPENJDK_SHA256SUM = 74916d6627ea7f058981140a018e93b33393be961e4c670a96e6cf9ddcf0923d +CORBA_SHA256SUM = 8d0b3dcbc5e160b0909e66a7b2aaa5f0783892d7ce2df4b7c3a00bb4eee7e882 +HOTSPOT_SHA256SUM = 506d69b628e1a15375bd81775be906fce6990e10a9cc2b6904a4485fa8dce518 +JAXP_SHA256SUM = 9244b44984c255e54e37a4556c4985f5356bd611de536f2bae58f9aa1d82bb7d +JAXWS_SHA256SUM = 44022c1546f6589f9bac6aa8079642aadf0c43e61afc074b841d3f6dd6e30609 +JDK_SHA256SUM = ba69d9e4cdd1a92bda3aaaf0fcabafa3663f01e19ee3575fd3d81c6c2027e653 +LANGTOOLS_SHA256SUM = 022e167d31a948cebe9ea163b4e3dafdc6d23acba16b40170b00c4b24f4a14d0 +OPENJDK_SHA256SUM = e2ce820b0da226ef334252469ba9e7a6186b35023f3c68751befaaffc6f86ee0 CACAO_VERSION = d6264eb66506 CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c @@ -31,14 +31,14 @@ JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops -JAXWS_DROP_ZIP = jdk7-jaxws2_2_2-2010_12_14.zip -JAXWS_DROP_SHA256SUM = ef3115dde8ed9a7129e65aab8b1499e11621e343559e6e5a8df9c4542848fb9b +JAXWS_DROP_ZIP = jdk7-jaxws2_2_4-b02-2011_05_09.zip +JAXWS_DROP_SHA256SUM = 2fd874aae97a4206c8f4cd93ee419c09f95c3f684349182b66b6ee9010c72f84 JAF_DROP_URL = http://icedtea.classpath.org/download/drops JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e JAXP_DROP_URL = http://icedtea.classpath.org/download/drops -JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip -JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5 +JAXP_DROP_ZIP = jaxp-1_4_5.zip +JAXP_DROP_SHA256SUM = 8145a789a61d21d0ff9902e4dc1c7ba492bb407ee614187dc933321922249ddb ICEDTEA_PREFIX = icedtea7-forest ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) @@ -247,7 +247,6 @@ ICEDTEA_PATCHES = \ patches/text-relocations.patch \ - patches/rmi_amd64.patch \ patches/demos.patch \ patches/headers.patch \ patches/gcc-suffix.patch \ @@ -272,7 +271,6 @@ patches/lc_ctype.patch \ patches/tests-jdk.patch \ patches/linker-libs-order.patch \ - patches/testenv.patch \ patches/samejvm-safe.patch \ patches/pr261.patch \ patches/parisc-opt.patch \
--- a/generated/sun/nio/ch/SocketOptionRegistry.java Mon Jun 06 15:30:31 2011 +0200 +++ b/generated/sun/nio/ch/SocketOptionRegistry.java Fri Jun 24 19:07:40 2011 +0100 @@ -1,17 +1,13 @@ /* -<<<<<<< local - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. -======= - * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. ->>>>>>> other + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -23,28 +19,25 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. * */ // AUTOMATICALLY GENERATED FILE - DO NOT EDIT package sun.nio.ch; - import java.net.SocketOption; -import java.net.StandardSocketOption; +import java.net.StandardSocketOptions; import java.net.ProtocolFamily; import java.net.StandardProtocolFamily; - import java.util.Map; import java.util.HashMap; - class SocketOptionRegistry { private SocketOptionRegistry() { } private static class RegistryKey { private final SocketOption<?> name; private final ProtocolFamily family; - RegistryKey(SocketOption<?> name, ProtocolFamily family) { + RegistryKey(SocketOption<?> name, ProtocolFamily family) { this.name = name; this.family = family; } @@ -65,20 +58,20 @@ private static Map<RegistryKey,OptionKey> options() { Map<RegistryKey,OptionKey> map = new HashMap<RegistryKey,OptionKey>(); - map.put(new RegistryKey(StandardSocketOption.SO_BROADCAST, Net.UNSPEC), new OptionKey(1, 6)); - map.put(new RegistryKey(StandardSocketOption.SO_KEEPALIVE, Net.UNSPEC), new OptionKey(1, 9)); - map.put(new RegistryKey(StandardSocketOption.SO_LINGER, Net.UNSPEC), new OptionKey(1, 13)); - map.put(new RegistryKey(StandardSocketOption.SO_SNDBUF, Net.UNSPEC), new OptionKey(1, 7)); - map.put(new RegistryKey(StandardSocketOption.SO_RCVBUF, Net.UNSPEC), new OptionKey(1, 8)); - map.put(new RegistryKey(StandardSocketOption.SO_REUSEADDR, Net.UNSPEC), new OptionKey(1, 2)); - map.put(new RegistryKey(StandardSocketOption.TCP_NODELAY, Net.UNSPEC), new OptionKey(6, 1)); - map.put(new RegistryKey(StandardSocketOption.IP_TOS, StandardProtocolFamily.INET), new OptionKey(0, 1)); - map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_IF, StandardProtocolFamily.INET), new OptionKey(0, 32)); - map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_TTL, StandardProtocolFamily.INET), new OptionKey(0, 33)); - map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_LOOP, StandardProtocolFamily.INET), new OptionKey(0, 34)); - map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_IF, StandardProtocolFamily.INET6), new OptionKey(41, 17)); - map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_TTL, StandardProtocolFamily.INET6), new OptionKey(41, 18)); - map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_LOOP, StandardProtocolFamily.INET6), new OptionKey(41, 19)); + map.put(new RegistryKey(StandardSocketOptions.SO_BROADCAST, Net.UNSPEC), new OptionKey(1, 6)); + map.put(new RegistryKey(StandardSocketOptions.SO_KEEPALIVE, Net.UNSPEC), new OptionKey(1, 9)); + map.put(new RegistryKey(StandardSocketOptions.SO_LINGER, Net.UNSPEC), new OptionKey(1, 13)); + map.put(new RegistryKey(StandardSocketOptions.SO_SNDBUF, Net.UNSPEC), new OptionKey(1, 7)); + map.put(new RegistryKey(StandardSocketOptions.SO_RCVBUF, Net.UNSPEC), new OptionKey(1, 8)); + map.put(new RegistryKey(StandardSocketOptions.SO_REUSEADDR, Net.UNSPEC), new OptionKey(1, 2)); + map.put(new RegistryKey(StandardSocketOptions.TCP_NODELAY, Net.UNSPEC), new OptionKey(6, 1)); + map.put(new RegistryKey(StandardSocketOptions.IP_TOS, StandardProtocolFamily.INET), new OptionKey(0, 1)); + map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_IF, StandardProtocolFamily.INET), new OptionKey(0, 32)); + map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_TTL, StandardProtocolFamily.INET), new OptionKey(0, 33)); + map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_LOOP, StandardProtocolFamily.INET), new OptionKey(0, 34)); + map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_IF, StandardProtocolFamily.INET6), new OptionKey(41, 17)); + map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_TTL, StandardProtocolFamily.INET6), new OptionKey(41, 18)); + map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_LOOP, StandardProtocolFamily.INET6), new OptionKey(41, 19)); map.put(new RegistryKey(ExtendedSocketOption.SO_OOBINLINE, Net.UNSPEC), new OptionKey(1, 10)); return map; }
--- a/patches/boot/ecj-autoboxing.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/boot/ecj-autoboxing.patch Fri Jun 24 19:07:40 2011 +0100 @@ -261,3 +261,27 @@ static private final String CLASS_PREFIX; // "java.lang.invoke.ToGeneric$" static { +diff -r d28f54a421b1 src/share/classes/sun/invoke/util/ValueConversions.java +--- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Thu Jun 23 17:29:41 2011 +0100 +@@ -209,9 +209,9 @@ + if (x instanceof Number) { + res = (Number) x; + } else if (x instanceof Boolean) { +- res = ((boolean)x ? 1 : 0); ++ res = ((Boolean)x ? 1 : 0); + } else if (x instanceof Character) { +- res = (int)(char)x; ++ res = (int)(Character)x; + } else { + // this will fail with the required ClassCastException: + res = (Number) x; +@@ -371,7 +371,7 @@ + + static int unboxRawInteger(Object x) { + if (x instanceof Integer) +- return (int) x; ++ return (Integer) x; + else + return (int) unboxLong(x, false); + }
--- a/patches/boot/ecj-diamond.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/boot/ecj-diamond.patch Fri Jun 24 19:07:40 2011 +0100 @@ -1,6 +1,6 @@ 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 2011-04-14 01:29:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-28 17:28:50.894745825 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-06-14 02:06:39.313002689 +0100 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -72,8 +72,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-28 17:28:50.902745957 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-06-14 02:06:39.329002971 +0100 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -136,8 +136,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-04-28 17:28:50.902745957 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-06-14 01:54:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-06-14 02:06:39.329002971 +0100 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -149,7 +149,7 @@ 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 2011-04-14 01:29:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-28 17:28:50.902745957 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-06-14 02:06:39.329002971 +0100 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -187,7 +187,7 @@ } 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 2011-04-14 01:29:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-04-28 17:28:50.902745957 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-06-14 02:06:39.329002971 +0100 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -199,7 +199,7 @@ 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 2011-04-14 01:29:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-04-28 17:28:50.902745957 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-06-14 02:06:39.329002971 +0100 @@ -919,7 +919,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -228,8 +228,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-06-14 02:06:39.329002971 +0100 @@ -59,7 +59,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -257,7 +257,7 @@ try { for (;;) { String state = parseCommandOptions(av, optionMap, avProps); -@@ -515,7 +515,7 @@ +@@ -530,7 +530,7 @@ String resultString = null; // Convert options string into optLines dictionary. @@ -268,7 +268,7 @@ 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 2011-04-14 01:29:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-04-28 17:28:50.906746023 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-06-14 02:06:39.329002971 +0100 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -279,8 +279,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-06-14 01:54:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-06-14 02:06:39.333003042 +0100 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -436,8 +436,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-06-14 02:06:39.333003042 +0100 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -551,8 +551,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-06-14 02:06:39.333003042 +0100 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -609,7 +609,7 @@ 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 2011-04-14 01:29:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-04-28 17:28:50.906746023 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-06-14 02:06:39.333003042 +0100 @@ -183,8 +183,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -641,7 +641,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-04-28 17:28:50.906746023 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-06-14 02:06:39.333003042 +0100 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -652,8 +652,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-06-14 02:06:39.333003042 +0100 @@ -48,8 +48,8 @@ */ @@ -685,7 +685,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-04-28 17:28:50.906746023 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-06-14 02:06:39.333003042 +0100 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -706,8 +706,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-06-14 02:06:39.333003042 +0100 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -718,8 +718,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-06-14 02:06:39.333003042 +0100 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -731,7 +731,7 @@ static TLGlobals getTLGlobals() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java --- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-04-28 17:28:50.906746023 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-06-14 02:06:39.333003042 +0100 @@ -135,7 +135,7 @@ throw new ConfigurationException("DNS pseudo-URL required"); } @@ -742,8 +742,8 @@ for (int i = 0; i < urls.length; i++) { String server = urls[i].getHost(); 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-06-14 02:06:39.333003042 +0100 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -758,8 +758,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-06-14 02:06:39.333003042 +0100 @@ -152,7 +152,7 @@ // new configuration @@ -788,8 +788,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-06-14 02:06:39.333003042 +0100 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -800,8 +800,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-06-14 02:06:39.333003042 +0100 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -812,8 +812,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-04-28 17:28:50.906746023 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-06-14 02:06:39.333003042 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -824,8 +824,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2011-06-14 02:06:39.333003042 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -836,8 +836,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2011-06-14 02:06:39.333003042 +0100 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -848,8 +848,8 @@ while (i < certs.length) { userCertList.add(certs[i]); 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2011-06-14 02:06:39.333003042 +0100 @@ -34,7 +34,7 @@ */ @@ -869,8 +869,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2011-06-14 02:06:39.333003042 +0100 @@ -57,7 +57,7 @@ private volatile boolean closed = false; @@ -881,9 +881,9 @@ 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 2011-04-20 04:40:21.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2011-04-28 17:28:50.910746089 +0100 -@@ -1084,7 +1084,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2011-06-14 02:06:39.337003113 +0100 +@@ -1082,7 +1082,7 @@ if ((names == null) || (filter == null)) { return names; } @@ -892,7 +892,7 @@ for (int i = 0 ; i < names.length ; i++) { if (filter.accept(this, names[i])) { v.add(names[i]); -@@ -1175,7 +1175,7 @@ +@@ -1173,7 +1173,7 @@ public File[] listFiles(FilenameFilter filter) { String ss[] = list(); if (ss == null) return null; @@ -901,7 +901,7 @@ for (String s : ss) if ((filter == null) || filter.accept(this, s)) files.add(new File(s, this)); -@@ -1213,7 +1213,7 @@ +@@ -1211,7 +1211,7 @@ public File[] listFiles(FileFilter filter) { String ss[] = list(); if (ss == null) return null; @@ -911,8 +911,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2011-06-14 02:06:39.337003113 +0100 @@ -70,7 +70,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -923,8 +923,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2011-06-14 02:06:39.337003113 +0100 @@ -725,7 +725,7 @@ */ @@ -954,7 +954,7 @@ } 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2011-04-28 17:28:50.910746089 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2011-06-14 02:06:39.337003113 +0100 @@ -213,7 +213,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -980,7 +980,7 @@ /** 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2011-04-28 17:28:50.910746089 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2011-06-14 02:06:39.341003184 +0100 @@ -165,11 +165,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1005,8 +1005,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2011-06-14 02:06:39.349003326 +0100 @@ -84,18 +84,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1087,8 +1087,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2011-04-28 17:28:50.910746089 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2011-06-14 02:06:39.349003326 +0100 @@ -47,7 +47,7 @@ } } @@ -1099,9 +1099,9 @@ // 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2011-04-28 17:28:50.914746155 +0100 -@@ -648,7 +648,8 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2011-06-14 02:06:39.349003326 +0100 +@@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1111,7 +1111,7 @@ /** * Creates a UnicodeBlock with the given identifier name. -@@ -4177,7 +4178,7 @@ +@@ -4175,7 +4176,7 @@ private static HashMap<String, Character.UnicodeScript> aliases; static { @@ -1122,7 +1122,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2011-04-28 17:28:50.914746155 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2011-06-14 02:06:39.349003326 +0100 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1133,9 +1133,9 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2011-04-28 17:28:50.914746155 +0100 -@@ -1306,7 +1306,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2011-06-14 02:06:39.353003397 +0100 +@@ -1308,7 +1308,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { public Class[] run() { @@ -1144,7 +1144,7 @@ Class<?> currentClass = Class.this; while (currentClass != null) { Class<?>[] members = currentClass.getDeclaredClasses(); -@@ -2306,9 +2306,9 @@ +@@ -2308,9 +2308,9 @@ res = Reflection.filterFields(this, getDeclaredFields0(publicOnly)); if (useCaches) { if (publicOnly) { @@ -1156,7 +1156,7 @@ } } return res; -@@ -2330,9 +2330,9 @@ +@@ -2332,9 +2332,9 @@ // No cached value available; compute value recursively. // Traverse in correct order for getField(). @@ -1168,7 +1168,7 @@ } // Local fields -@@ -2358,7 +2358,7 @@ +@@ -2360,7 +2360,7 @@ res = new Field[fields.size()]; fields.toArray(res); if (useCaches) { @@ -1177,7 +1177,7 @@ } return res; } -@@ -2403,9 +2403,9 @@ +@@ -2405,9 +2405,9 @@ } if (useCaches) { if (publicOnly) { @@ -1189,7 +1189,7 @@ } } return res; -@@ -2440,9 +2440,9 @@ +@@ -2442,9 +2442,9 @@ res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly)); if (useCaches) { if (publicOnly) { @@ -1201,7 +1201,7 @@ } } return res; -@@ -2598,7 +2598,7 @@ +@@ -2600,7 +2600,7 @@ methods.compactAndTrim(); res = methods.getArray(); if (useCaches) { @@ -1210,7 +1210,7 @@ } return res; } -@@ -2977,7 +2977,7 @@ +@@ -2979,7 +2979,7 @@ if (universe == null) throw new IllegalArgumentException( getName() + " is not an enum type"); @@ -1219,7 +1219,7 @@ for (T constant : universe) m.put(((Enum<?>)constant).name(), constant); enumConstantDirectory = m; -@@ -3090,7 +3090,7 @@ +@@ -3092,7 +3092,7 @@ if (superClass == null) { annotations = declaredAnnotations; } else { @@ -1229,8 +1229,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 2011-04-20 04:40:21.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2011-04-28 17:28:50.914746155 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-14 02:06:39.353003397 +0100 @@ -246,7 +246,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1271,7 +1271,7 @@ assertionLock = this; } } -@@ -1180,7 +1181,7 @@ +@@ -1175,7 +1176,7 @@ } tmp[1] = findResources(name); @@ -1280,7 +1280,7 @@ } /** -@@ -1662,7 +1663,7 @@ +@@ -1657,7 +1658,7 @@ protected Package[] getPackages() { Map<String, Package> map; synchronized (packages) { @@ -1289,7 +1289,7 @@ } Package[] pkgs; if (parent != null) { -@@ -1769,17 +1770,20 @@ +@@ -1764,17 +1765,20 @@ } // All native library names we've loaded. @@ -1314,7 +1314,7 @@ // The paths searched for libraries private static String usr_paths[]; -@@ -2102,8 +2106,8 @@ +@@ -2097,8 +2101,8 @@ * them to empty maps, effectively ignoring any present settings. */ synchronized (assertionLock) { @@ -1325,7 +1325,7 @@ defaultAssertionStatus = false; } } -@@ -2165,8 +2169,8 @@ +@@ -2160,8 +2164,8 @@ private void initializeJavaAssertionMaps() { // assert Thread.holdsLock(assertionLock); @@ -1337,21 +1337,21 @@ for(int i = 0; i < directives.classes.length; i++) 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2011-04-28 17:28:50.914746155 +0100 -@@ -794,7 +794,7 @@ - */ - public static List<Class<? extends PlatformManagedObject>> getAllPlatformMXBeanInterfaces() { - List<Class<? extends PlatformManagedObject>> result = -- new ArrayList<>(); -+ new ArrayList<Class<? extends PlatformManagedObject>>(); +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2011-06-14 03:12:48.854240573 +0100 +@@ -787,7 +787,7 @@ + getPlatformManagementInterfaces() + { + Set<Class<? extends PlatformManagedObject>> result = +- new TreeSet<>(); ++ new TreeSet<Class<? extends PlatformManagedObject>>(); for (PlatformComponent component: PlatformComponent.values()) { 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2011-04-28 17:28:50.914746155 +0100 -@@ -267,7 +267,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2011-06-16 14:48:49.994623079 +0100 +@@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = ManagementFactoryHelper.getGarbageCollectorMXBeans(); @@ -1360,7 +1360,7 @@ for (GarbageCollectorMXBean m : list) { if (gcMXBeanIntf.isInstance(m)) { result.add(gcMXBeanIntf.cast(m)); -@@ -330,7 +330,7 @@ +@@ -342,7 +342,7 @@ } private static Set<String> keyProperties(String... keyNames) { @@ -1369,8 +1369,8 @@ set.add("type"); for (String s : keyNames) { set.add(s); -@@ -364,7 +364,7 @@ - List<T> getMXBeans(MBeanServerConnection mbs, Class<T> mxbeanInterface) +@@ -407,7 +407,7 @@ + List<T> getMXBeans(MBeanServerConnection mbs, Class<T> mxbeanInterface) throws java.io.IOException { - List<T> result = new ArrayList<>(); @@ -1378,10 +1378,19 @@ for (ObjectName on : getObjectNames(mbs)) { result.add(ManagementFactory. newPlatformMXBeanProxy(mbs, +@@ -438,7 +438,7 @@ + private static Map<String, PlatformComponent> enumMap; + private static synchronized void ensureInitialized() { + if (enumMap == null) { +- enumMap = new HashMap<>(); ++ enumMap = new HashMap<String,PlatformComponent>(); + for (PlatformComponent pc: PlatformComponent.values()) { + // 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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2011-04-28 17:28:50.914746155 +0100 -@@ -597,13 +597,16 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2011-06-14 02:06:39.365003610 +0100 +@@ -596,13 +596,16 @@ } // The map of loaded system packages @@ -1402,8 +1411,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2011-04-28 17:28:50.914746155 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2011-06-14 02:06:39.365003610 +0100 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1423,9 +1432,9 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2011-04-28 17:28:50.914746155 +0100 -@@ -144,7 +144,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2011-06-14 02:06:39.365003610 +0100 +@@ -136,7 +136,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class // objects.) @@ -1435,8 +1444,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2011-04-28 17:28:50.914746155 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2011-06-14 02:06:39.365003610 +0100 @@ -232,7 +232,7 @@ /** maps a class loader to the proxy class cache for that loader */ @@ -1465,8 +1474,8 @@ } /* 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2011-04-28 17:28:50.914746155 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2011-06-14 02:06:39.365003610 +0100 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1477,8 +1486,8 @@ checkedExceptions, modifiers, 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2011-04-28 17:28:50.914746155 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2011-06-14 02:06:39.365003610 +0100 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -1492,8 +1501,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2011-06-14 02:06:39.365003610 +0100 @@ -2330,7 +2330,7 @@ int off = 0; int next = 0; @@ -1504,8 +1513,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 2011-04-20 04:40:21.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2011-06-14 02:06:39.365003610 +0100 @@ -1616,7 +1616,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -1531,9 +1540,9 @@ /** 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2011-04-28 17:28:50.918746222 +0100 -@@ -828,7 +828,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2011-06-14 03:12:32.581961140 +0100 +@@ -917,7 +917,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; } else { // Copy Throwables to new list @@ -1542,18 +1551,18 @@ for (Throwable t : suppressedExceptions) { // Enforce constraints on suppressed exceptions in // case of corrupt or malicious stream. -@@ -912,7 +912,7 @@ - return; - - if (suppressedExceptions == SUPPRESSED_SENTINEL) -- suppressedExceptions = new ArrayList<>(1); -+ suppressedExceptions = new ArrayList<Throwable>(1); - - assert suppressedExceptions != SUPPRESSED_SENTINEL; - +@@ -1048,7 +1048,7 @@ + return; + + if (suppressedExceptions == SUPPRESSED_SENTINEL) +- suppressedExceptions = new ArrayList<>(1); ++ suppressedExceptions = new ArrayList<Throwable>(1); + + 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2011-06-14 02:06:39.365003610 +0100 @@ -677,7 +677,7 @@ static InetAddressImpl impl; @@ -1573,8 +1582,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-14 02:06:39.365003610 +0100 @@ -205,7 +205,7 @@ */ @@ -1585,8 +1594,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2011-06-14 02:06:39.369003681 +0100 @@ -1487,7 +1487,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -1606,8 +1615,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 2011-04-20 04:40:21.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2011-06-14 02:06:39.369003681 +0100 @@ -124,7 +124,7 @@ this.context = null; } @@ -1618,8 +1627,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2011-06-14 02:06:39.369003681 +0100 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -1631,7 +1640,7 @@ 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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2011-04-28 17:28:50.918746222 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2011-06-14 02:06:39.369003681 +0100 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -1655,8 +1664,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2011-06-14 02:06:39.369003681 +0100 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -1676,8 +1685,8 @@ perms.putAll(permsMap); } 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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2011-06-14 02:06:39.369003681 +0100 @@ -368,8 +368,8 @@ int swag = 32; int vcap = 8; @@ -1690,8 +1699,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2011-06-14 02:06:39.369003681 +0100 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -1720,8 +1729,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2011-06-14 02:06:39.373003752 +0100 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -1732,8 +1741,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2011-06-14 02:06:39.373003752 +0100 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -1780,8 +1789,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2011-06-14 02:06:39.373003752 +0100 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -1819,8 +1828,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2011-04-28 17:28:50.918746222 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2011-06-14 02:06:39.373003752 +0100 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -1832,7 +1841,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2011-04-28 17:28:50.922746289 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2011-06-14 02:06:39.373003752 +0100 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -1862,8 +1871,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2011-04-28 17:28:50.922746289 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2011-06-14 02:06:39.373003752 +0100 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -1874,8 +1883,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2011-04-28 17:28:50.922746289 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2011-06-14 02:06:39.377003822 +0100 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -2464,7 +2473,7 @@ } } -@@ -3594,7 +3595,7 @@ +@@ -3596,7 +3597,7 @@ if (cmp instanceof ReverseComparator2) return ((ReverseComparator2<T>)cmp).cmp; @@ -2473,7 +2482,7 @@ } /** -@@ -3673,7 +3674,7 @@ +@@ -3675,7 +3676,7 @@ * @see ArrayList */ public static <T> ArrayList<T> list(Enumeration<T> e) { @@ -2482,7 +2491,7 @@ while (e.hasMoreElements()) l.add(e.nextElement()); return l; -@@ -3865,7 +3866,7 @@ +@@ -3868,7 +3869,7 @@ * @since 1.6 */ public static <E> Set<E> newSetFromMap(Map<E, Boolean> map) { @@ -2491,7 +2500,7 @@ } /** -@@ -3929,7 +3930,7 @@ +@@ -3932,7 +3933,7 @@ * @since 1.6 */ public static <T> Queue<T> asLifoQueue(Deque<T> deque) { @@ -2501,9 +2510,9 @@ /** 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2011-04-28 17:28:50.922746289 +0100 -@@ -499,7 +499,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2011-06-14 02:06:39.377003822 +0100 +@@ -500,7 +500,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) if (vals[i] != null) @@ -2513,8 +2522,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2011-04-28 17:28:50.922746289 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2011-06-14 02:06:39.377003822 +0100 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -2537,9 +2546,9 @@ // 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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2011-04-28 17:28:50.922746289 +0100 -@@ -2516,7 +2516,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2011-06-14 01:54:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2011-06-14 02:06:39.377003822 +0100 +@@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ private FormatString[] parse(String s) { @@ -2549,8 +2558,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2011-04-28 17:28:50.922746289 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2011-06-14 02:06:39.377003822 +0100 @@ -763,7 +763,7 @@ */ void addEntry(int hash, K key, V value, int bucketIndex) { @@ -2570,8 +2579,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2011-04-28 17:28:50.922746289 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2011-06-14 02:06:39.377003822 +0100 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -2618,8 +2627,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 2011-04-26 10:01:40.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2011-04-28 17:28:50.922746289 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2011-06-14 02:06:39.377003822 +0100 @@ -455,7 +455,7 @@ // Creates the new entry. @@ -2675,9 +2684,9 @@ } 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2011-04-28 17:28:50.926746356 +0100 -@@ -1134,7 +1134,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2011-06-14 02:06:39.377003822 +0100 +@@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); for (int i = 0; i < size; i++) @@ -2686,7 +2695,7 @@ return result; } -@@ -1146,7 +1146,7 @@ +@@ -1157,7 +1157,7 @@ .newInstance(a.getClass().getComponentType(), size); Iterator<Map.Entry<K,V>> it = iterator(); for (int i = 0; i < size; i++) @@ -2696,8 +2705,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2011-06-14 02:06:39.377003822 +0100 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -2708,8 +2717,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2011-06-14 02:06:39.377003822 +0100 @@ -237,7 +237,7 @@ * the chain. */ @@ -2729,8 +2738,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2011-06-14 02:06:39.377003822 +0100 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -2769,7 +2778,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2011-04-28 17:28:50.926746356 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2011-06-14 02:06:39.377003822 +0100 @@ -187,7 +187,7 @@ return; @@ -2780,8 +2789,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/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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2011-06-14 02:06:39.377003822 +0100 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -2792,8 +2801,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2011-06-14 02:06:39.377003822 +0100 @@ -59,7 +59,7 @@ */ @@ -2804,8 +2813,8 @@ /** 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2011-06-14 02:06:39.377003822 +0100 @@ -170,7 +170,7 @@ private LogManager manager; private String name; @@ -2815,7 +2824,7 @@ private String resourceBundleName; private volatile boolean useParentHandlers = true; private volatile Filter filter; -@@ -1420,7 +1420,7 @@ +@@ -1439,7 +1439,7 @@ // Set our new parent. parent = newParent; if (parent.kids == null) { @@ -2825,8 +2834,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2011-06-14 02:06:39.381003892 +0100 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -2837,8 +2846,8 @@ for (; loggers.hasMoreElements();) { array.add((String) loggers.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2011-06-14 02:06:39.381003892 +0100 @@ -156,7 +156,8 @@ private final static Level defaultLevel = Level.INFO; @@ -2849,7 +2858,7 @@ // Tree of named Loggers private LogNode root = new LogNode(null); private Logger rootLogger; -@@ -421,7 +422,7 @@ +@@ -444,7 +445,7 @@ // loggerRefQueue holds LoggerWeakRef objects for Logger objects // that have been GC'ed. private final ReferenceQueue<Logger> loggerRefQueue @@ -2858,7 +2867,7 @@ // Package-level inner class. // Helper class for managing WeakReferences to Logger objects. -@@ -671,7 +672,7 @@ +@@ -694,7 +695,7 @@ name = ""; } if (node.children == null) { @@ -2867,7 +2876,7 @@ } LogNode child = node.children.get(head); if (child == null) { -@@ -855,7 +856,7 @@ +@@ -878,7 +879,7 @@ } hands = hands.trim(); int ix = 0; @@ -2878,7 +2887,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2011-04-28 17:28:50.926746356 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2011-06-14 02:06:39.381003892 +0100 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -2890,8 +2899,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2011-04-28 17:28:50.926746356 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2011-06-14 02:06:39.381003892 +0100 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -2923,7 +2932,7 @@ * 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2011-04-28 17:28:50.926746356 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2011-06-14 02:06:39.381003892 +0100 @@ -538,7 +538,7 @@ cursor--; else { @@ -2934,9 +2943,9 @@ } } 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2011-04-28 17:28:50.926746356 +0100 -@@ -1011,7 +1011,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2011-06-14 02:06:39.381003892 +0100 +@@ -1010,7 +1010,7 @@ * @since 1.6 */ public Set<String> stringPropertyNames() { @@ -2946,9 +2955,9 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2011-04-28 17:28:50.926746356 +0100 -@@ -1080,7 +1080,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2011-06-14 02:06:39.381003892 +0100 +@@ -1193,7 +1193,7 @@ public String[] split(CharSequence input, int limit) { int index = 0; boolean matchLimited = limit > 0; @@ -2957,7 +2966,7 @@ Matcher m = matcher(input); // Add segments before each match found -@@ -1578,7 +1578,7 @@ +@@ -1695,7 +1695,7 @@ Map<String, Integer> namedGroups() { if (namedGroups == null) @@ -2966,7 +2975,7 @@ return namedGroups; } -@@ -5331,7 +5331,7 @@ +@@ -5495,7 +5495,7 @@ } private static final HashMap<String, CharPropertyFactory> map @@ -2976,8 +2985,8 @@ static { // Unicode character property aliases, defined in 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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2011-06-14 02:06:39.381003892 +0100 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -2988,8 +2997,8 @@ private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2011-06-14 02:06:39.381003892 +0100 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3018,8 +3027,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2011-06-14 02:06:39.381003892 +0100 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3030,8 +3039,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2011-06-14 02:06:39.381003892 +0100 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3088,7 +3097,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2011-04-28 17:28:50.930746423 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2011-06-14 02:06:39.381003892 +0100 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3156,8 +3165,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2011-06-14 02:06:39.381003892 +0100 @@ -171,7 +171,7 @@ /** * Reference queue for cleared WeakEntries @@ -3190,30 +3199,39 @@ } 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-04-28 17:28:50.930746423 +0100 -@@ -315,7 +315,7 @@ - private static native void freeEntry(long jzfile, long jzentry); - - // the outstanding inputstreams that need to be closed. -- private Set<InputStream> streams = new HashSet<>(); -+ private Set<InputStream> streams = new HashSet<InputStream>(); +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-06-14 03:12:14.233646034 +0100 +@@ -319,7 +319,7 @@ + + // the outstanding inputstreams that need to be closed, + // mapped to the inflater objects they use. +- private final Map<InputStream, Inflater> streams = new WeakHashMap<>(); ++ private final Map<InputStream, Inflater> streams = new WeakHashMap<InputStream,Inflater>(); /** * Returns an input stream for reading the contents of the specified -@@ -545,7 +545,7 @@ - - if (streams.size() !=0) { - Set<InputStream> copy = streams; -- streams = new HashSet<>(); -+ streams = new HashSet<InputStream>(); - for (InputStream is: copy) - is.close(); - } +@@ -461,7 +461,7 @@ + } + + // List of available Inflater objects for decompression +- private Deque<Inflater> inflaterCache = new ArrayDeque<>(); ++ private Deque<Inflater> inflaterCache = new ArrayDeque<Inflater>(); + + /** + * Returns the path name of the ZIP file. +@@ -577,7 +577,7 @@ + // Close streams, release their inflaters + synchronized (streams) { + if (false == streams.isEmpty()) { +- Map<InputStream, Inflater> copy = new HashMap<>(streams); ++ Map<InputStream, Inflater> copy = new HashMap<InputStream,Inflater>(streams); + streams.clear(); + 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2011-04-28 17:28:50.930746423 +0100 -@@ -52,8 +52,8 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2011-06-14 02:06:39.385003963 +0100 +@@ -53,8 +53,8 @@ } private XEntry current; @@ -3225,8 +3243,8 @@ private long written = 0; private long locoff = 0; 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2011-06-14 02:06:39.385003963 +0100 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -3237,8 +3255,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2011-06-14 02:06:39.385003963 +0100 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -3249,8 +3267,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2011-06-14 02:06:39.385003963 +0100 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -3261,8 +3279,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2011-06-14 02:06:39.385003963 +0100 @@ -48,7 +48,7 @@ private Subject subject; @@ -3274,7 +3292,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2011-04-28 17:28:50.930746423 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2011-06-14 02:06:39.385003963 +0100 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -3286,7 +3304,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2011-04-28 17:28:50.930746423 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2011-06-14 02:06:39.385003963 +0100 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -3297,8 +3315,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-06-14 01:54:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-06-14 02:06:39.385003963 +0100 @@ -169,7 +169,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -3319,7 +3337,7 @@ } 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2011-04-28 17:28:50.930746423 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2011-06-14 02:06:39.385003963 +0100 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -3349,7 +3367,7 @@ // 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2011-04-28 17:28:50.930746423 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2011-06-14 02:06:39.385003963 +0100 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -3361,7 +3379,7 @@ * return false immediately if not. Otherwise block until 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2011-04-28 17:28:50.930746423 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2011-06-14 02:06:39.385003963 +0100 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -3399,8 +3417,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2011-04-28 17:28:50.930746423 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2011-06-14 02:06:39.385003963 +0100 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -3411,8 +3429,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2011-06-14 02:06:39.385003963 +0100 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -3425,8 +3443,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2011-06-14 02:06:39.385003963 +0100 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -3435,10 +3453,10 @@ + Set<WatchEvent.Kind<?>> eventSet = new HashSet<WatchEvent.Kind<?>>(events.length); for (WatchEvent.Kind<?> event: events) { // standard events - if (event == StandardWatchEventKind.ENTRY_CREATE || + 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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2011-06-14 02:06:39.385003963 +0100 @@ -77,7 +77,7 @@ throws IOException { @@ -3458,8 +3476,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2011-06-14 02:06:39.385003963 +0100 @@ -71,7 +71,7 @@ @Override @@ -3470,9 +3488,9 @@ 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 2011-04-26 09:41:52.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2011-04-28 17:28:50.934746489 +0100 -@@ -62,7 +62,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2011-06-14 02:06:39.385003963 +0100 +@@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ static <E> Set<E> newSet(E... elements) { @@ -3481,7 +3499,7 @@ for (E e: elements) { set.add(e); } -@@ -74,7 +74,7 @@ +@@ -75,7 +75,7 @@ * the given elements. */ static <E> Set<E> newSet(Set<E> other, E... elements) { @@ -3491,8 +3509,8 @@ set.add(e); } 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2011-06-14 02:06:39.385003963 +0100 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -3503,8 +3521,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2011-06-14 02:06:39.385003963 +0100 @@ -41,15 +41,15 @@ // or principal. // @@ -3545,8 +3563,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2011-06-14 02:06:39.385003963 +0100 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -3566,8 +3584,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2011-06-14 02:06:39.385003963 +0100 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -3605,8 +3623,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2011-06-14 02:06:39.385003963 +0100 @@ -40,7 +40,7 @@ public class Providers { @@ -3617,9 +3635,9 @@ // 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/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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2011-04-28 17:28:50.934746489 +0100 -@@ -528,7 +528,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2011-06-14 02:06:39.389004034 +0100 +@@ -527,7 +527,7 @@ } }))); String Line; @@ -3628,7 +3646,7 @@ String previous = null; while ((Line = br.readLine()) != null) { // ignore comments and blank line in the configuration file. -@@ -589,7 +589,7 @@ +@@ -588,7 +588,7 @@ throw new KrbException("I/O error while reading" + " configuration file."); } @@ -3637,7 +3655,7 @@ for (int i = 0; i < v.size(); i++) { String line = v.elementAt(i).trim(); if (line.equalsIgnoreCase("[realms]")) { -@@ -598,7 +598,7 @@ +@@ -597,7 +597,7 @@ if ((count == v.size()) || (v.elementAt(count).startsWith("["))) { Hashtable<String,Hashtable<String,Vector<String>>> temp = @@ -3646,7 +3664,7 @@ temp = parseRealmField(v, i + 1, count); table.put("realms", temp); i = count - 1; -@@ -611,7 +611,7 @@ +@@ -610,7 +610,7 @@ if ((count == v.size()) || (v.elementAt(count).startsWith("["))) { Hashtable<String,Hashtable<String,Vector<String>>> temp = @@ -3655,7 +3673,7 @@ temp = parseRealmField(v, i + 1, count); table.put("capaths", temp); i = count - 1; -@@ -729,7 +729,7 @@ +@@ -728,7 +728,7 @@ * Parses key-value pairs under a stanza name. */ private Hashtable<String,String> parseField(Vector<String> v, int start, int end) { @@ -3664,7 +3682,7 @@ String line; for (int i = start; i < end; i++) { line = v.elementAt(i); -@@ -751,7 +751,7 @@ +@@ -750,7 +750,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) { @@ -3673,7 +3691,7 @@ String line; for (int i = start; i < end; i++) { line = v.elementAt(i).trim(); -@@ -791,9 +791,9 @@ +@@ -790,9 +790,9 @@ * Parses key-value pairs within each braces under [realms]. */ private Hashtable<String,Vector<String>> parseRealmFieldEx(Vector<String> v, int start, int end) { @@ -3686,7 +3704,7 @@ String line = ""; String key; for (int i = start; i < end; i++) { -@@ -898,7 +898,7 @@ +@@ -897,7 +897,7 @@ } st = new StringTokenizer(default_enctypes, delim); int len = st.countTokens(); @@ -3697,7 +3715,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2011-06-14 02:06:39.389004034 +0100 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3709,7 +3727,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2011-06-14 02:06:39.389004034 +0100 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3720,8 +3738,8 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2011-06-14 02:06:39.389004034 +0100 @@ -490,7 +490,7 @@ private static String exec(String c) { @@ -3732,8 +3750,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2011-06-14 02:06:39.389004034 +0100 @@ -257,7 +257,7 @@ + configName); } @@ -3745,7 +3763,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2011-06-14 02:06:39.389004034 +0100 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3756,8 +3774,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2011-06-14 02:06:39.389004034 +0100 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -3778,7 +3796,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2011-06-14 02:06:39.389004034 +0100 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -3808,7 +3826,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2011-06-14 02:06:39.389004034 +0100 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -3820,7 +3838,7 @@ } 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2011-06-14 02:06:39.389004034 +0100 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3832,7 +3850,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2011-06-14 02:06:39.389004034 +0100 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -3843,8 +3861,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2011-06-14 02:06:39.389004034 +0100 @@ -260,7 +260,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -3855,27 +3873,36 @@ // 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2011-04-28 17:28:50.934746489 +0100 -@@ -57,7 +57,7 @@ - private static KeyTab singleton = null; - private static final boolean DEBUG = Krb5.DEBUG; - private static String name; +--- 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 2011-06-14 03:11:08.608518854 +0100 +@@ -67,7 +67,7 @@ + + // Attention: Currently there is no way to remove a keytab from this map, + // this might lead to a memory leak. +- private static Map<String,KeyTab> map = new HashMap<>(); ++ private static Map<String,KeyTab> map = new HashMap<String,KeyTab>(); + + // KeyTab file does not exist. Note: a missing keytab is still valid + private boolean isMissing = false; +@@ -79,7 +79,7 @@ + private long lastModified; + private int kt_vno; + - private Vector<KeyTabEntry> entries = new Vector<>(); + private Vector<KeyTabEntry> entries = new Vector<KeyTabEntry>(); - private KeyTab(String filename) throws IOException, RealmException { - init(filename); -@@ -240,7 +240,7 @@ + /** + * Constructs a KeyTab object. +@@ -276,7 +276,7 @@ KeyTabEntry entry; EncryptionKey key; int size = entries.size(); - ArrayList<EncryptionKey> keys = new ArrayList<>(size); + ArrayList<EncryptionKey> keys = new ArrayList<EncryptionKey>(size); - for (int i = size-1; i >= 0; i--) { entry = entries.elementAt(i); -@@ -436,7 +436,7 @@ + if (entry.service.match(service)) { +@@ -470,7 +470,7 @@ int count = 0; // Remember the highest KVNO for each etype. Used for kvno == -2 @@ -3886,7 +3913,7 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2011-04-28 17:28:50.934746489 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2011-06-14 02:06:39.389004034 +0100 @@ -77,7 +77,7 @@ */ @@ -3897,8 +3924,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2011-04-28 17:28:50.934746489 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2011-06-14 02:06:39.389004034 +0100 @@ -462,7 +462,7 @@ */ static class KdcAccessibility { @@ -3921,8 +3948,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2011-06-14 02:06:39.389004034 +0100 @@ -244,7 +244,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -3942,9 +3969,9 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2011-04-28 17:28:50.938746555 +0100 -@@ -359,12 +359,12 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2011-06-14 03:11:24.440790814 +0100 +@@ -359,14 +359,14 @@ } String tempTarget = null, tempRealm = null; @@ -3952,16 +3979,18 @@ + Stack<String> iStack = new Stack<String>(); /* - * I don't expect any more than a handful of intermediaries. + * The half-established reversed-path, starting from the final target + * (sRealm), each item can be connected to by the next one. + * Might contains wrong item, if found, a bad track is performed */ - Vector<String> tempList = new Vector<>(8, 8); + Vector<String> tempList = new Vector<String>(8, 8); - - /* - * The initiator at first location. + tempList.add(sRealm); + + int count = 0; // For debug only 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2011-04-28 17:28:50.938746555 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2011-06-14 02:06:39.389004034 +0100 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -3972,8 +4001,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2011-06-14 02:06:39.389004034 +0100 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -4064,8 +4093,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2011-06-14 02:06:39.389004034 +0100 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -4076,8 +4105,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2011-06-14 02:06:39.389004034 +0100 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4088,8 +4117,8 @@ SunRsaSignEntries.putEntries(map); AccessController.doPrivileged(new PutAllAction(this, map)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2011-06-14 02:06:39.393004105 +0100 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -4135,8 +4164,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2011-06-14 02:06:39.393004105 +0100 @@ -219,7 +219,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -4147,8 +4176,8 @@ /** * Set of blinding parameters for a given RSA key. 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2011-06-14 02:06:39.393004105 +0100 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4159,8 +4188,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2011-06-14 02:06:39.393004105 +0100 @@ -393,7 +393,7 @@ // Map BulkCipher -> Boolean(available) @@ -4170,21 +4199,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/CipherSuiteList.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java 2011-04-28 17:28:50.938746555 +0100 -@@ -221,7 +221,7 @@ - private static CipherSuiteList buildAvailableCache(int minPriority) { - // SortedSet automatically arranges ciphersuites in default - // preference order -- Set<CipherSuite> cipherSuites = new TreeSet<>(); -+ Set<CipherSuite> cipherSuites = new TreeSet<CipherSuite>(); - Collection<CipherSuite> allowedCipherSuites = - CipherSuite.allowedCipherSuites(); - for (CipherSuite c : allowedCipherSuites) { 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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2011-04-28 17:28:50.938746555 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2011-06-14 02:06:39.393004105 +0100 @@ -656,7 +656,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -4212,21 +4229,9 @@ for (CipherSuite suite : cipherSuites.collection()) { if (suite != CipherSuite.C_SCSV) { cipherList.add(suite); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java 2011-04-28 17:28:50.938746555 +0100 -@@ -98,7 +98,7 @@ - return defaultKeyManagers; - } - -- final Map<String,String> props = new HashMap<>(); -+ final Map<String,String> props = new HashMap<String,String>(); - AccessController.doPrivileged( - new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception { 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2011-06-14 02:06:46.965138212 +0100 @@ -258,7 +258,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -4245,7 +4250,7 @@ CertificateFactory cf = null; while (chainLen > 0) { -@@ -1328,7 +1328,7 @@ +@@ -1334,7 +1334,7 @@ // read the certificate_authorities int len = input.getInt16(); @@ -4254,7 +4259,7 @@ while (len >= 3) { DistinguishedName dn = new DistinguishedName(input); v.add(dn); -@@ -1719,7 +1719,7 @@ +@@ -1725,7 +1725,7 @@ // Note that this will prevent the Spi classes from being GC'd. We assume // that is not a problem. private final static Map<Class,Object> methodCache = @@ -4264,8 +4269,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 2011-04-15 17:04:04.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2011-06-14 02:06:46.965138212 +0100 @@ -569,7 +569,7 @@ activeProtocols = getActiveProtocols(); } @@ -4285,8 +4290,8 @@ boolean found = false; for (CipherSuite suite : enabledCipherSuites.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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2011-04-28 17:28:50.938746555 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2011-06-14 02:06:46.973138354 +0100 @@ -169,7 +169,7 @@ return name; } @@ -4306,9 +4311,9 @@ 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2011-04-28 17:28:50.938746555 +0100 -@@ -83,7 +83,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2011-06-14 02:06:46.973138354 +0100 +@@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -4318,8 +4323,8 @@ ProtocolVersion version = ProtocolVersion.valueOf(names[i]); if (versions.contains(version) == false) { 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2011-06-14 02:06:46.973138354 +0100 @@ -153,7 +153,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -4357,8 +4362,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2011-06-14 02:06:46.973138354 +0100 @@ -261,7 +261,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -4405,8 +4410,8 @@ if(cipherSuite.keyExchange != null) { components.addAll( 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2011-06-14 02:06:46.973138354 +0100 @@ -618,7 +618,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -4426,8 +4431,8 @@ Object securityCtx = SecureKey.getCurrentSecurityContext(); 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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2011-06-14 02:06:46.973138354 +0100 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -4447,8 +4452,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2011-06-14 02:06:46.973138354 +0100 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -4459,8 +4464,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 2011-04-14 01:29:59.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2011-06-14 02:06:46.973138354 +0100 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -4480,8 +4485,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2011-06-14 02:06:46.973138354 +0100 @@ -123,14 +123,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -4544,7 +4549,7 @@ boolean wasSigned = false; -@@ -1475,7 +1475,7 @@ +@@ -1476,7 +1476,7 @@ return false; } @@ -4553,7 +4558,7 @@ /** * Returns a string of singer info, with a newline at the end -@@ -1599,7 +1599,7 @@ +@@ -1600,7 +1600,7 @@ } } } @@ -4563,8 +4568,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2011-06-14 02:06:46.977138425 +0100 @@ -152,11 +152,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -4580,7 +4585,7 @@ enum Command { CERTREQ("Generates.a.certificate.request", -@@ -2090,7 +2090,7 @@ +@@ -2089,7 +2089,7 @@ */ public static List<CRL> readCRLsFromCert(X509Certificate cert) throws Exception { @@ -4589,7 +4594,7 @@ CRLDistributionPointsExtension ext = X509CertImpl.toImpl(cert).getCRLDistributionPointsExtension(); if (ext == null) return crls; -@@ -2257,7 +2257,7 @@ +@@ -2256,7 +2256,7 @@ if (jarfile != null) { JarFile jf = new JarFile(jarfile, true); Enumeration<JarEntry> entries = jf.entries(); @@ -4598,7 +4603,7 @@ byte[] buffer = new byte[8192]; int pos = 0; while (entries.hasMoreElements()) { -@@ -3336,7 +3336,7 @@ +@@ -3331,7 +3331,7 @@ } // start building chain @@ -4607,7 +4612,7 @@ if (buildChain((X509Certificate)certToVerify, chain, certs)) { Certificate[] newChain = new Certificate[chain.size()]; // buildChain() returns chain with self-signed root-cert first and -@@ -3862,7 +3862,7 @@ +@@ -3857,7 +3857,7 @@ break; case 2: // EKU if(value != null) { @@ -4616,7 +4621,7 @@ for (String s: value.split(",")) { int p = oneOf(s, "anyExtendedKeyUsage", -@@ -3932,7 +3932,7 @@ +@@ -3927,7 +3927,7 @@ } if(value != null) { List<AccessDescription> accessDescriptions = @@ -4625,7 +4630,7 @@ String[] ps = value.split(","); for(String item: ps) { colonpos = item.indexOf(':'); -@@ -4216,7 +4216,7 @@ +@@ -4211,7 +4211,7 @@ } public static <A,B> Pair<A,B> of(A a, B b) { @@ -4635,8 +4640,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2011-06-14 02:06:46.977138425 +0100 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -4674,8 +4679,8 @@ super(i, b); } 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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2011-06-14 02:06:46.977138425 +0100 @@ -94,7 +94,7 @@ * Run the converter */ @@ -4686,8 +4691,8 @@ boolean createOutputFile = false; 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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2011-04-28 17:28:50.942746621 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2011-06-14 02:06:46.977138425 +0100 @@ -113,7 +113,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -4706,7 +4711,7 @@ } return log; } -@@ -488,7 +488,7 @@ +@@ -469,7 +469,7 @@ */ static class JavaLogger extends LoggerProxy { private static final Map<Integer, Object> levelObjects = @@ -4716,9 +4721,9 @@ static { if (LoggingSupport.isAvailable()) { 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 2011-04-11 12:34:33.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2011-04-28 17:28:50.942746621 +0100 -@@ -152,7 +152,7 @@ +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2011-06-14 02:06:46.977138425 +0100 +@@ -151,7 +151,7 @@ } Action action = Action.valueOf(args[0]); @@ -4727,7 +4732,7 @@ if (action == Action.create) env.put("create", "true"); try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) { -@@ -632,9 +632,9 @@ +@@ -647,9 +647,9 @@ private static void fchCopy(Path src, Path dst) throws IOException { @@ -4739,7 +4744,7 @@ openwrite.add(CREATE_NEW); openwrite.add(WRITE); -@@ -652,9 +652,9 @@ +@@ -667,9 +667,9 @@ private static void chCopy(Path src, Path dst) throws IOException { @@ -4753,7 +4758,7 @@ 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 2011-03-14 22:10:33.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2011-04-28 17:28:50.942746621 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2011-06-14 02:06:46.977138425 +0100 @@ -133,8 +133,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -4766,8 +4771,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 2011-04-11 12:34:33.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2011-06-14 02:06:46.977138425 +0100 @@ -125,7 +125,7 @@ throws IOException { @@ -4778,8 +4783,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2011-06-14 02:06:46.977138425 +0100 @@ -147,7 +147,7 @@ @Override @@ -4880,8 +4885,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 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2011-06-14 02:06:46.977138425 +0100 @@ -53,7 +53,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -4892,8 +4897,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2011-06-14 02:06:46.977138425 +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. @@ -4904,8 +4909,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 2011-04-28 17:10:59.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2011-06-14 01:54:53.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2011-06-14 02:06:46.977138425 +0100 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -4971,7 +4976,7 @@ 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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-04-28 17:28:50.946746687 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-06-14 02:06:46.977138425 +0100 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -4992,7 +4997,7 @@ sl.add(domain); 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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2011-04-28 17:28:50.946746687 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2011-06-14 02:06:46.977138425 +0100 @@ -153,12 +153,12 @@ static { @@ -5011,8 +5016,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 2011-04-20 04:40:24.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2011-06-14 02:06:46.977138425 +0100 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -5032,8 +5037,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2011-06-14 02:06:46.977138425 +0100 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -5044,8 +5049,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2011-06-14 02:06:46.977138425 +0100 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -5056,8 +5061,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2011-06-14 02:06:46.981138496 +0100 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -5077,8 +5082,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2011-06-14 02:06:46.981138496 +0100 @@ -83,7 +83,7 @@ } @@ -5089,8 +5094,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2011-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2011-06-14 02:06:46.981138496 +0100 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -5101,8 +5106,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2011-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2011-06-14 02:06:46.981138496 +0100 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -5125,7 +5130,7 @@ 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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-04-28 17:28:50.946746687 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-06-14 02:06:46.981138496 +0100 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -5136,9 +5141,9 @@ // 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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2011-04-28 17:28:50.946746687 +0100 -@@ -127,7 +127,7 @@ +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2011-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2011-06-14 02:06:46.981138496 +0100 +@@ -128,7 +128,7 @@ } // iterate over roots, ignoring those that the security manager denies @@ -5148,8 +5153,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 2011-04-20 04:40:24.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2011-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2011-06-14 02:06:46.981138496 +0100 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -5160,8 +5165,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2011-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2011-06-14 02:06:46.981138496 +0100 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -5172,8 +5177,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2011-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2011-06-14 02:06:46.981138496 +0100 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -5220,8 +5225,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2011-06-11 00:38:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2011-06-14 02:06:46.981138496 +0100 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -5232,8 +5237,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2011-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2011-06-14 02:06:46.981138496 +0100 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -5244,8 +5249,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 2011-04-20 04:40:25.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2011-04-28 17:28:50.946746687 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2011-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2011-06-14 02:06:46.981138496 +0100 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -5256,8 +5261,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2011-04-28 17:28:50.950746753 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2011-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2011-06-14 02:06:46.981138496 +0100 @@ -103,7 +103,7 @@ } } @@ -5268,8 +5273,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2011-04-28 17:28:50.950746753 +0100 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2011-06-11 00:38:18.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2011-06-14 02:06:46.981138496 +0100 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -5280,8 +5285,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 2011-04-14 01:30:00.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2011-04-28 17:28:50.950746753 +0100 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2011-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2011-06-14 02:06:46.981138496 +0100 @@ -59,7 +59,7 @@ } } @@ -5291,3 +5296,493 @@ List<Thread> threads = new ArrayList<Thread>(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); +diff -r d28f54a421b1 src/share/classes/java/util/Locale.java +--- openjdk-boot/jdk/src/share/classes/java/util/Locale.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java Thu Jun 16 14:21:08 2011 +0100 +@@ -1793,7 +1793,7 @@ + return formatList(variantNames, listPattern, listCompositionPattern); + } + } +- ArrayList<String> names = new ArrayList<>(4); ++ ArrayList<String> names = new ArrayList<String>(4); + if (languageName.length() != 0) { + names.add(languageName); + } +diff -r d28f54a421b1 src/share/classes/java/util/ResourceBundle.java +--- openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java Thu Jun 16 14:21:08 2011 +0100 +@@ -289,7 +289,7 @@ + * name for compatibility with some workarounds for bug 4212439. + */ + private static final ConcurrentMap<CacheKey, BundleReference> cacheList +- = new ConcurrentHashMap<>(INITIAL_CACHE_SIZE); ++ = new ConcurrentHashMap<CacheKey,BundleReference>(INITIAL_CACHE_SIZE); + + /** + * Queue for reference objects referring to class loaders or bundles. +@@ -1754,7 +1754,7 @@ + * @since 1.6 + */ + public Set<String> keySet() { +- Set<String> keys = new HashSet<>(); ++ Set<String> keys = new HashSet<String>(); + for (ResourceBundle rb = this; rb != null; rb = rb.parent) { + keys.addAll(rb.handleKeySet()); + } +@@ -1782,7 +1782,7 @@ + if (keySet == null) { + synchronized (this) { + if (keySet == null) { +- Set<String> keys = new HashSet<>(); ++ Set<String> keys = new HashSet<String>(); + Enumeration<String> enumKeys = getKeys(); + while (enumKeys.hasMoreElements()) { + String key = enumKeys.nextElement(); +@@ -2300,7 +2300,7 @@ + if (baseName == null) { + throw new NullPointerException(); + } +- return new ArrayList<>(CANDIDATES_CACHE.get(locale.getBaseLocale())); ++ return new ArrayList<Locale>(CANDIDATES_CACHE.get(locale.getBaseLocale())); + } + + private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache(); +@@ -2326,7 +2326,7 @@ + if (language.equals("nb") || isNorwegianBokmal) { + List<Locale> tmpList = getDefaultList("nb", script, region, variant); + // Insert a locale replacing "nb" with "no" for every list entry +- List<Locale> bokmalList = new LinkedList<>(); ++ List<Locale> bokmalList = new LinkedList<Locale>(); + for (Locale l : tmpList) { + bokmalList.add(l); + if (l.getLanguage().length() == 0) { +@@ -2373,7 +2373,7 @@ + List<String> variants = null; + + if (variant.length() > 0) { +- variants = new LinkedList<>(); ++ variants = new LinkedList<String>(); + int idx = variant.length(); + while (idx != -1) { + variants.add(variant.substring(0, idx)); +@@ -2381,7 +2381,7 @@ + } + } + +- List<Locale> list = new LinkedList<>(); ++ List<Locale> list = new LinkedList<Locale>(); + + if (variants != null) { + for (String v : variants) { +diff -r d28f54a421b1 src/share/classes/java/util/regex/UnicodeProp.java +--- openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java Thu Jun 16 14:21:08 2011 +0100 +@@ -193,8 +193,8 @@ + } + }; + +- private final static HashMap<String, String> posix = new HashMap<>(); +- private final static HashMap<String, String> aliases = new HashMap<>(); ++ private final static HashMap<String, String> posix = new HashMap<String,String>(); ++ private final static HashMap<String, String> aliases = new HashMap<String,String>(); + static { + posix.put("ALPHA", "ALPHABETIC"); + posix.put("LOWER", "LOWERCASE"); +diff -r d28f54a421b1 src/share/classes/sun/management/ManagementFactoryHelper.java +--- openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java Thu Jun 16 14:21:08 2011 +0100 +@@ -204,7 +204,7 @@ + private static List<BufferPoolMXBean> bufferPools = null; + public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { + if (bufferPools == null) { +- bufferPools = new ArrayList<>(2); ++ bufferPools = new ArrayList<BufferPoolMXBean>(2); + bufferPools.add(createBufferPoolMXBean(sun.misc.SharedSecrets.getJavaNioAccess() + .getDirectBufferPool())); + bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl +diff -r d28f54a421b1 src/share/classes/sun/util/locale/InternalLocaleBuilder.java +--- openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java Thu Jun 16 14:21:08 2011 +0100 +@@ -113,7 +113,7 @@ + } + // Use case insensitive string to prevent duplication + if (uattributes == null) { +- uattributes = new HashSet<>(4); ++ uattributes = new HashSet<CaseInsensitiveString>(4); + } + uattributes.add(new CaseInsensitiveString(attribute)); + return this; +@@ -157,7 +157,7 @@ + } + } + if (ukeywords == null) { +- ukeywords = new HashMap<>(4); ++ ukeywords = new HashMap<CaseInsensitiveString,String>(4); + } + ukeywords.put(cikey, type); + } +@@ -211,7 +211,7 @@ + setUnicodeLocaleExtension(val); + } else { + if (extensions == null) { +- extensions = new HashMap<>(4); ++ extensions = new HashMap<CaseInsensitiveChar,String>(4); + } + extensions.put(key, val); + } +@@ -262,7 +262,7 @@ + } + + if (extensions == null) { +- extensions = new ArrayList<>(4); ++ extensions = new ArrayList<String>(4); + } + extensions.add(sb.toString()); + } else { +@@ -313,7 +313,7 @@ + clearExtensions(); + + if (!LocaleUtils.isEmpty(bcpExtensions)) { +- Set<CaseInsensitiveChar> done = new HashSet<>(bcpExtensions.size()); ++ Set<CaseInsensitiveChar> done = new HashSet<CaseInsensitiveChar>(bcpExtensions.size()); + for (String bcpExt : bcpExtensions) { + CaseInsensitiveChar key = new CaseInsensitiveChar(bcpExt); + // ignore duplicates +@@ -323,7 +323,7 @@ + setUnicodeLocaleExtension(bcpExt.substring(2)); + } else { + if (extensions == null) { +- extensions = new HashMap<>(4); ++ extensions = new HashMap<CaseInsensitiveChar,String>(4); + } + extensions.put(key, bcpExt.substring(2)); + } +@@ -334,7 +334,7 @@ + if (privateuse != null && privateuse.length() > 0) { + // privateuse string contains prefix, e.g. "x-abc-def" + if (extensions == null) { +- extensions = new HashMap<>(1); ++ extensions = new HashMap<CaseInsensitiveChar,String>(1); + } + extensions.put(new CaseInsensitiveChar(privateuse), privateuse.substring(2)); + } +@@ -442,19 +442,19 @@ + UnicodeLocaleExtension ue = (UnicodeLocaleExtension)e; + for (String uatr : ue.getUnicodeLocaleAttributes()) { + if (uattributes == null) { +- uattributes = new HashSet<>(4); ++ uattributes = new HashSet<CaseInsensitiveString>(4); + } + uattributes.add(new CaseInsensitiveString(uatr)); + } + for (String ukey : ue.getUnicodeLocaleKeys()) { + if (ukeywords == null) { +- ukeywords = new HashMap<>(4); ++ ukeywords = new HashMap<CaseInsensitiveString,String>(4); + } + ukeywords.put(new CaseInsensitiveString(ukey), ue.getUnicodeLocaleType(ukey)); + } + } else { + if (extensions == null) { +- extensions = new HashMap<>(4); ++ extensions = new HashMap<CaseInsensitiveChar,String>(4); + } + extensions.put(new CaseInsensitiveChar(key), e.getValue()); + } +@@ -604,7 +604,7 @@ + break; + } + if (uattributes == null) { +- uattributes = new HashSet<>(4); ++ uattributes = new HashSet<CaseInsensitiveString>(4); + } + uattributes.add(new CaseInsensitiveString(itr.current())); + itr.next(); +@@ -622,7 +622,7 @@ + assert(typeStart == -1 || typeEnd != -1); + type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); + if (ukeywords == null) { +- ukeywords = new HashMap<>(4); ++ ukeywords = new HashMap<CaseInsensitiveString,String>(4); + } + ukeywords.put(key, type); + +@@ -652,7 +652,7 @@ + assert(typeStart == -1 || typeEnd != -1); + type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); + if (ukeywords == null) { +- ukeywords = new HashMap<>(4); ++ ukeywords = new HashMap<CaseInsensitiveString,String>(4); + } + ukeywords.put(key, type); + } +diff -r d28f54a421b1 src/share/classes/sun/util/locale/LanguageTag.java +--- openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java Thu Jun 16 14:21:08 2011 +0100 +@@ -62,7 +62,7 @@ + // Map contains grandfathered tags and its preferred mappings from + // http://www.ietf.org/rfc/rfc5646.txt + // Keys are lower-case strings. +- private static final Map<String, String[]> GRANDFATHERED = new HashMap<>(); ++ private static final Map<String, String[]> GRANDFATHERED = new HashMap<String,String[]>(); + + static { + // grandfathered = irregular ; non-redundant tags registered +@@ -257,7 +257,7 @@ + } + found = true; + if (extlangs.isEmpty()) { +- extlangs = new ArrayList<>(3); ++ extlangs = new ArrayList<String>(3); + } + extlangs.add(s); + sts.parseLength = itr.currentEnd(); +@@ -322,7 +322,7 @@ + } + found = true; + if (variants.isEmpty()) { +- variants = new ArrayList<>(3); ++ variants = new ArrayList<String>(3); + } + variants.add(s); + sts.parseLength = itr.currentEnd(); +@@ -365,7 +365,7 @@ + } + + if (extensions.isEmpty()) { +- extensions = new ArrayList<>(4); ++ extensions = new ArrayList<String>(4); + } + extensions.add(sb.toString()); + found = true; +@@ -462,7 +462,7 @@ + break; + } + if (variants == null) { +- variants = new ArrayList<>(); ++ variants = new ArrayList<String>(); + } + variants.add(var); // Do not canonicalize! + varitr.next(); +@@ -503,7 +503,7 @@ + privateuse = ext.getValue(); + } else { + if (extensions == null) { +- extensions = new ArrayList<>(); ++ extensions = new ArrayList<String>(); + } + extensions.add(locextKey.toString() + SEP + ext.getValue()); + } +diff -r d28f54a421b1 src/share/classes/sun/util/locale/LocaleExtensions.java +--- openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java Thu Jun 16 14:21:08 2011 +0100 +@@ -81,7 +81,7 @@ + } + + // Build extension map +- SortedMap<Character, Extension> map = new TreeMap<>(); ++ SortedMap<Character, Extension> map = new TreeMap<Character,Extension>(); + if (hasExtension) { + for (Entry<CaseInsensitiveChar, String> ext : extensions.entrySet()) { + char key = LocaleUtils.toLower(ext.getKey().value()); +@@ -104,14 +104,14 @@ + SortedMap<String, String> ukmap = null; + + if (hasUAttributes) { +- uaset = new TreeSet<>(); ++ uaset = new TreeSet<String>(); + for (CaseInsensitiveString cis : uattributes) { + uaset.add(LocaleUtils.toLowerString(cis.value())); + } + } + + if (hasUKeywords) { +- ukmap = new TreeMap<>(); ++ ukmap = new TreeMap<String,String>(); + for (Entry<CaseInsensitiveString, String> kwd : ukeywords.entrySet()) { + String key = LocaleUtils.toLowerString(kwd.getKey().value()); + String type = LocaleUtils.toLowerString(kwd.getValue()); +diff -r d28f54a421b1 src/share/classes/sun/util/locale/LocaleObjectCache.java +--- openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java Thu Jun 16 14:21:08 2011 +0100 +@@ -38,14 +38,14 @@ + + public abstract class LocaleObjectCache<K, V> { + private ConcurrentMap<K, CacheEntry<K, V>> map; +- private ReferenceQueue<V> queue = new ReferenceQueue<>(); ++ private ReferenceQueue<V> queue = new ReferenceQueue<V>(); + + public LocaleObjectCache() { + this(16, 0.75f, 16); + } + + public LocaleObjectCache(int initialCapacity, float loadFactor, int concurrencyLevel) { +- map = new ConcurrentHashMap<>(initialCapacity, loadFactor, concurrencyLevel); ++ map = new ConcurrentHashMap<K, CacheEntry<K,V>>(initialCapacity, loadFactor, concurrencyLevel); + } + + public V get(K key) { +@@ -64,7 +64,7 @@ + return null; + } + +- CacheEntry<K, V> newEntry = new CacheEntry<>(key, newVal, queue); ++ CacheEntry<K, V> newEntry = new CacheEntry<K,V>(key, newVal, queue); + + while (value == null) { + cleanStaleEntries(); +@@ -81,7 +81,7 @@ + } + + protected V put(K key, V value) { +- CacheEntry<K, V> entry = new CacheEntry<>(key, value, queue); ++ CacheEntry<K, V> entry = new CacheEntry<K,V>(key, value, queue); + CacheEntry<K, V> oldEntry = map.put(key, entry); + return (oldEntry == null) ? null : oldEntry.get(); + } +diff -r d28f54a421b1 src/share/classes/sun/invoke/util/ValueConversions.java +--- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Wed Jun 22 23:00:36 2011 +0100 +@@ -47,7 +47,7 @@ + EnumMap<Wrapper, MethodHandle>[] caches + = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap[n]; // unchecked warning expected here + for (int i = 0; i < n; i++) +- caches[i] = new EnumMap<>(Wrapper.class); ++ caches[i] = new EnumMap<Wrapper, MethodHandle>(Wrapper.class); + return caches; + } + +@@ -994,7 +994,7 @@ + Object a8, Object a9) + { return makeArray(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } + private static MethodHandle[] makeArrays() { +- ArrayList<MethodHandle> mhs = new ArrayList<>(); ++ ArrayList<MethodHandle> mhs = new ArrayList<MethodHandle>(); + for (;;) { + MethodHandle mh = findCollector("array", mhs.size(), Object[].class); + if (mh == null) break; +@@ -1040,7 +1040,7 @@ + Object a8, Object a9) + { fillWithArguments(a, pos, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); return a; } + private static MethodHandle[] makeFillArrays() { +- ArrayList<MethodHandle> mhs = new ArrayList<>(); ++ ArrayList<MethodHandle> mhs = new ArrayList<MethodHandle>(); + mhs.add(null); // there is no empty fill; at least a0 is required + for (;;) { + MethodHandle mh = findCollector("fillArray", mhs.size(), Object[].class, Object[].class, Integer.class); +@@ -1195,7 +1195,7 @@ + Object a8, Object a9) + { return makeList(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } + private static MethodHandle[] makeLists() { +- ArrayList<MethodHandle> mhs = new ArrayList<>(); ++ ArrayList<MethodHandle> mhs = new ArrayList<MethodHandle>(); + for (;;) { + MethodHandle mh = findCollector("list", mhs.size(), List.class); + if (mh == null) break; +diff -r d28f54a421b1 src/share/classes/com/sun/rowset/CachedRowSetImpl.java +--- openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java Thu Jun 23 18:36:40 2011 +0100 +@@ -1284,7 +1284,7 @@ + */ + public Collection<?> toCollection() throws SQLException { + +- TreeMap<Integer, Object> tMap = new TreeMap<>(); ++ TreeMap<Integer, Object> tMap = new TreeMap<Integer, Object>(); + + for (int i = 0; i<numRows; i++) { + tMap.put(Integer.valueOf(i), rvh.get(i)); +@@ -1314,7 +1314,7 @@ + public Collection<?> toCollection(int column) throws SQLException { + + int nRows = numRows; +- Vector<Object> vec = new Vector<>(nRows); ++ Vector<Object> vec = new Vector<Object>(nRows); + + // create a copy + CachedRowSetImpl crsTemp; +diff -r d28f54a421b1 src/share/classes/sun/security/jgss/krb5/Krb5Util.java +--- openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Fri Jun 24 13:56:10 2011 +0100 +@@ -267,7 +267,7 @@ + if (ktabs.isEmpty()) { + return kk.toArray(new KerberosKey[kk.size()]); + } else { +- List<KerberosKey> keys = new ArrayList<>(); ++ List<KerberosKey> keys = new ArrayList<KerberosKey>(); + for (KeyTab ktab: ktabs) { + for (KerberosKey k: ktab.getKeys(kp)) { + keys.add(k); +diff -r d28f54a421b1 src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java +--- openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Fri Jun 24 13:56:10 2011 +0100 +@@ -590,7 +590,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. +- Set<TrustAnchor> newTrustAnchors = new HashSet<>(trustAnchors); ++ Set<TrustAnchor> newTrustAnchors = new HashSet<TrustAnchor>(trustAnchors); + + if (prevKey != null) { + // Add the previous certificate as a trust anchor. +diff -r d28f54a421b1 src/share/classes/sun/security/ssl/SSLContextImpl.java +--- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java Fri Jun 24 13:56:10 2011 +0100 +@@ -325,7 +325,7 @@ + Collection<CipherSuite> allowedCipherSuites = + CipherSuite.allowedCipherSuites(); + +- ArrayList<CipherSuite> suites = new ArrayList<>(); ++ ArrayList<CipherSuite> suites = new ArrayList<CipherSuite>(); + if (!(protocols.collection().isEmpty()) && + protocols.min.v != ProtocolVersion.NONE.v) { + for (CipherSuite suite : allowedCipherSuites) { +@@ -532,7 +532,7 @@ + return defaultKeyManagers; + } + +- final Map<String,String> props = new HashMap<>(); ++ final Map<String,String> props = new HashMap<String,String>(); + AccessController.doPrivileged( + new PrivilegedExceptionAction<Object>() { + public Object run() throws Exception { +diff -r d28f54a421b1 src/share/classes/sun/rmi/server/Activation.java +--- openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java Fri Jun 24 14:48:19 2011 +0100 +@@ -149,10 +149,10 @@ + + /** maps activation id to its respective group id */ + private Map<ActivationID,ActivationGroupID> idTable = +- new ConcurrentHashMap<>(); ++ new ConcurrentHashMap<ActivationID,ActivationGroupID>(); + /** maps group id to its GroupEntry groups */ + private Map<ActivationGroupID,GroupEntry> groupTable = +- new ConcurrentHashMap<>(); ++ new ConcurrentHashMap<ActivationGroupID,GroupEntry>(); + + private byte majorVersion = MAJOR_VERSION; + private byte minorVersion = MINOR_VERSION; +@@ -288,10 +288,10 @@ + { + ois.defaultReadObject(); + if (! (groupTable instanceof ConcurrentHashMap)) { +- groupTable = new ConcurrentHashMap<>(groupTable); ++ groupTable = new ConcurrentHashMap<ActivationGroupID,GroupEntry>(groupTable); + } + if (! (idTable instanceof ConcurrentHashMap)) { +- idTable = new ConcurrentHashMap<>(idTable); ++ idTable = new ConcurrentHashMap<ActivationID,ActivationGroupID>(idTable); + } + } + +diff -r d28f54a421b1 src/share/classes/com/sun/rowset/JoinRowSetImpl.java +--- openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java Fri Jun 24 16:36:28 2011 +0100 +@@ -222,7 +222,7 @@ + // either of the setter methods have been set. + if(boolColId){ + // +- ArrayList<Integer> indices = new ArrayList<>(); ++ ArrayList<Integer> indices = new ArrayList<Integer>(); + for(int i=0;i<cRowset.getMatchColumnNames().length;i++) { + if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) { + iMatchKey = cRowset.findColumn(strMatchKey);
--- a/patches/boot/ecj-multicatch.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/boot/ecj-multicatch.patch Fri Jun 24 19:07:40 2011 +0100 @@ -69,3 +69,47 @@ throw new IllegalArgumentException(charsetName); } } +diff -r d28f54a421b1 src/share/classes/java/lang/management/ManagementFactory.java +--- openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java Tue Jun 21 01:53:32 2011 +0100 +@@ -606,7 +606,9 @@ + // create an MXBean proxy + return JMX.newMXBeanProxy(connection, objName, mxbeanInterface, + emitter); +- } catch (InstanceNotFoundException|MalformedObjectNameException e) { ++ } catch (InstanceNotFoundException e) { ++ throw new IllegalArgumentException(e); ++ } catch (MalformedObjectNameException e) { + throw new IllegalArgumentException(e); + } + } +diff -r d28f54a421b1 src/share/classes/sun/text/bidi/BidiBase.java +--- openjdk-boot/jdk/src/share/classes/sun/text/bidi/BidiBase.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/text/bidi/BidiBase.java Tue Jun 21 01:53:32 2011 +0100 +@@ -3477,7 +3477,9 @@ + try { + Field f = clazz.getField(name); + return f.get(null); +- } catch (NoSuchFieldException | IllegalAccessException x) { ++ } catch (NoSuchFieldException x) { ++ throw new AssertionError(x); ++ } catch (IllegalAccessException x) { + throw new AssertionError(x); + } + } +diff -r d28f54a421b1 src/share/classes/sun/invoke/util/ValueConversions.java +--- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Thu Jun 23 15:55:48 2011 +0100 +@@ -661,7 +661,11 @@ + IGNORE = IMPL_LOOKUP.findStatic(THIS_CLASS, "ignore", ignoreType); + EMPTY = IMPL_LOOKUP.findStatic(THIS_CLASS, "empty", ignoreType.dropParameterTypes(0, 1)); + NEW_ARRAY = IMPL_LOOKUP.findStatic(THIS_CLASS, "newArray", MethodType.methodType(Object[].class, int.class)); +- } catch (NoSuchMethodException | IllegalAccessException ex) { ++ } catch (NoSuchMethodException ex) { ++ Error err = new InternalError("uncaught exception"); ++ err.initCause(ex); ++ throw err; ++ } catch (IllegalAccessException ex) { + Error err = new InternalError("uncaught exception"); + err.initCause(ex); + throw err;
--- a/patches/boot/ecj-trywithresources.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/boot/ecj-trywithresources.patch Fri Jun 24 19:07:40 2011 +0100 @@ -856,3 +856,73 @@ } catch (IOException x) { } return result; +diff -r d28f54a421b1 src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java +--- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Mon Jun 13 15:58:42 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Tue Jun 21 14:46:11 2011 +0100 +@@ -92,9 +92,13 @@ + tabName = filename; + try { + lastModified = new File(tabName).lastModified(); +- try (KeyTabInputStream kis = +- new KeyTabInputStream(new FileInputStream(filename))) { ++ KeyTabInputStream kis = null; ++ try { ++ kis = new KeyTabInputStream(new FileInputStream(filename)); + load(kis); ++ } finally { ++ if (kis != null) ++ kis.close(); + } + } catch (FileNotFoundException e) { + entries.clear(); +@@ -439,9 +443,13 @@ + public synchronized static KeyTab create(String name) + throws IOException, RealmException { + +- try (KeyTabOutputStream kos = +- new KeyTabOutputStream(new FileOutputStream(name))) { ++ KeyTabOutputStream kos = null; ++ try { ++ kos = new KeyTabOutputStream(new FileOutputStream(name)); + kos.writeVersion(KRB5_KT_VNO); ++ } finally { ++ if (kos != null) ++ kos.close(); + } + return new KeyTab(name); + } +@@ -450,12 +458,16 @@ + * Saves the file at the directory. + */ + public synchronized void save() throws IOException { +- try (KeyTabOutputStream kos = +- new KeyTabOutputStream(new FileOutputStream(tabName))) { ++ KeyTabOutputStream kos = null; ++ try { ++ kos = new KeyTabOutputStream(new FileOutputStream(tabName)); + kos.writeVersion(kt_vno); + for (int i = 0; i < entries.size(); i++) { + kos.writeEntry(entries.elementAt(i)); + } ++ } finally { ++ if (kos != null) ++ kos.close(); + } + } + +@@ -519,9 +531,13 @@ + * @exception IOException. + */ + public synchronized void createVersion(File file) throws IOException { +- try (KeyTabOutputStream kos = +- new KeyTabOutputStream(new FileOutputStream(file))) { ++ KeyTabOutputStream kos = null; ++ try { ++ kos = new KeyTabOutputStream(new FileOutputStream(file)); + kos.write16(KRB5_KT_VNO); ++ } finally { ++ if (kos != null) ++ kos.close(); + } + } + }
--- a/patches/boot/jar.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/boot/jar.patch Fri Jun 24 19:07:40 2011 +0100 @@ -1,44 +1,41 @@ -diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk ---- ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk 2009-10-30 16:49:37.000000000 +0000 -+++ openjdk-boot/jdk/make/common/Release.gmk 2009-10-30 16:59:16.000000000 +0000 -@@ -650,10 +650,21 @@ +diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk +--- openjdk-boot.orig/jdk/make/common/Release.gmk 2011-06-13 16:08:46.000000000 +0100 ++++ openjdk-boot/jdk/make/common/Release.gmk 2011-06-13 17:06:49.515488800 +0100 +@@ -627,9 +627,19 @@ RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar - $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE) + $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(OTHER_JAR_MANIFEST_FILE) $(prep-target) +ifneq (,$(JAR_KNOWS_ATFILE)) $(CD) $(CLASSBINDIR) && \ - $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ + $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \ @$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS) -- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) -+ @$(CD) $(CLASSBINDIR) +else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) + (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \ -+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(OTHER_JAR_MANIFEST_FILE) $@ \ + $(BOOT_JAR_JFLAGS)) +else + (cd $(CLASSBINDIR) && \ -+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \ + $(BOOT_JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`) +endif -+ $(java-vm-cleanup) + @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) # Create jsse.jar containing SunJSSE implementation classes - JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar -@@ -711,9 +722,19 @@ +@@ -683,9 +693,19 @@ RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar - $(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE) + $(RT_JAR): $(RT_JAR_FILELIST) $(RT_JAR_MANIFEST_FILE) $(prep-target) +ifneq (,$(JAR_KNOWS_ATFILE)) $(CD) $(CLASSBINDIR) && \ - $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ + $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $@ \ @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS) +else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) + $(CD) $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \ -+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(RT_JAR_MANIFEST_FILE) $@ \ + $(BOOT_JAR_JFLAGS) +else + $(CD) $(CLASSBINDIR) && \ -+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $@ \ + $(BOOT_JAR_JFLAGS) `cat $(RT_JAR_FILELIST)` +endif @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
--- a/patches/boot/revert-6941137.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/boot/revert-6941137.patch Fri Jun 24 19:07:40 2011 +0100 @@ -1,11 +1,11 @@ -diff -r c981a387cd86 src/share/classes/sun/util/calendar/ZoneInfoFile.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Mon Nov 22 21:55:09 2010 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Tue Nov 23 23:05:24 2010 +0000 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2011-06-14 01:44:11.082438342 +0100 @@ -486,7 +486,7 @@ String otherDir = getZoneInfoDir(homeDir); if (otherDir != null) zi = otherDir; -- zi = FileSystems.getDefault().getPath(zi).toRealPath(true).toString(); +- zi = FileSystems.getDefault().getPath(zi).toRealPath().toString(); + zi = new File(zi).getCanonicalPath(); } catch(Exception e) { }
--- a/patches/boot/symbols.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/boot/symbols.patch Fri Jun 24 19:07:40 2011 +0100 @@ -1,7 +1,7 @@ diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk ---- openjdk-boot.orig/jdk/make/common/Release.gmk 2010-09-01 20:18:58.000000000 +0100 -+++ openjdk-boot/jdk/make/common/Release.gmk 2010-09-01 20:24:27.111708385 +0100 -@@ -1013,19 +1013,6 @@ +--- openjdk-boot.orig/jdk/make/common/Release.gmk 2011-06-13 17:19:59.000000000 +0100 ++++ openjdk-boot/jdk/make/common/Release.gmk 2011-06-14 01:19:26.469436464 +0100 +@@ -975,19 +975,6 @@ @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar @# @@ -13,7 +13,7 @@ - -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ - -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ - $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) -- $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \ +- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(LIBDIR)/ct.sym \ - -C $(OUTPUTDIR)/symbols META-INF $(BOOT_JAR_JFLAGS) - @$(java-vm-cleanup) - $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
--- a/patches/libraries.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/libraries.patch Fri Jun 24 19:07:40 2011 +0100 @@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile ---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2011-04-20 04:40:20.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2011-04-21 09:00:44.681761082 +0100 -@@ -74,12 +74,10 @@ +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2011-06-11 00:38:06.000000000 +0100 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2011-06-13 15:12:16.465040427 +0100 +@@ -70,12 +70,10 @@ $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) @@ -16,7 +16,7 @@ endif CXXFLAGS_DBG += -DFULL -@@ -98,12 +96,12 @@ +@@ -94,12 +92,12 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space @@ -32,9 +32,9 @@ endif #LINUX endif #PLATFORM diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk ---- openjdk.orig/jdk/make/common/Program.gmk 2011-04-20 04:40:20.000000000 +0100 -+++ openjdk/jdk/make/common/Program.gmk 2011-04-21 09:02:42.995660993 +0100 -@@ -83,6 +83,7 @@ +--- openjdk.orig/jdk/make/common/Program.gmk 2011-06-11 00:38:06.000000000 +0100 ++++ openjdk/jdk/make/common/Program.gmk 2011-06-13 15:12:16.465040427 +0100 +@@ -91,6 +91,7 @@ endif endif ifeq ($(PLATFORM), linux) @@ -42,7 +42,7 @@ LDFLAGS += $(LDFLAG_Z_ORIGIN) LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli -@@ -239,7 +240,6 @@ +@@ -247,7 +248,6 @@ endif OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin @@ -51,8 +51,8 @@ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile ---- openjdk.orig/jdk/make/java/jli/Makefile 2011-04-20 04:40:20.000000000 +0100 -+++ openjdk/jdk/make/java/jli/Makefile 2011-04-21 09:00:44.681761082 +0100 +--- openjdk.orig/jdk/make/java/jli/Makefile 2011-06-11 00:38:06.000000000 +0100 ++++ openjdk/jdk/make/java/jli/Makefile 2011-06-13 15:12:16.465040427 +0100 @@ -44,7 +44,6 @@ include $(BUILDDIR)/common/Defs.gmk @@ -101,7 +101,7 @@ +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk --- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2010-07-29 21:55:27.000000000 +0100 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2011-04-21 09:00:44.681761082 +0100 ++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2011-06-13 15:12:16.477040613 +0100 @@ -29,16 +29,4 @@ Deflater.c \ Inflater.c \ @@ -121,9 +121,9 @@ - zutil.c + zip_util.c diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile ---- openjdk.orig/jdk/make/java/zip/Makefile 2011-04-20 04:40:20.000000000 +0100 -+++ openjdk/jdk/make/java/zip/Makefile 2011-04-21 09:00:44.697761341 +0100 -@@ -71,16 +71,10 @@ +--- openjdk.orig/jdk/make/java/zip/Makefile 2011-06-11 00:38:06.000000000 +0100 ++++ openjdk/jdk/make/java/zip/Makefile 2011-06-13 15:12:16.477040613 +0100 +@@ -74,16 +74,10 @@ CPPFLAGS += -UDEBUG endif @@ -143,7 +143,7 @@ +OTHER_LDLIBS = $(JVMLIB) -lz diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk --- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2010-07-29 21:55:29.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2011-04-21 09:00:44.697761341 +0100 ++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2011-06-13 15:12:16.477040613 +0100 @@ -25,51 +25,7 @@ FILES_c = \ @@ -198,9 +198,9 @@ ifndef OPENJDK FILES_c += \ diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile ---- openjdk.orig/jdk/make/sun/jpeg/Makefile 2011-04-20 04:40:21.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/Makefile 2011-04-21 09:00:44.697761341 +0100 -@@ -80,6 +80,8 @@ +--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2011-06-11 00:38:07.000000000 +0100 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2011-06-13 15:12:16.477040613 +0100 +@@ -86,6 +86,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk @@ -211,7 +211,7 @@ # diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk --- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2010-07-29 21:55:29.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2011-04-21 09:00:44.697761341 +0100 ++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2011-06-13 15:12:16.477040613 +0100 @@ -30,79 +30,5 @@ splashscreen_impl.c \ splashscreen_jpeg.c \ @@ -294,8 +294,8 @@ + splashscreen_sys.c diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile ---- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2011-04-20 04:40:21.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2011-04-21 09:00:44.697761341 +0100 +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2011-06-11 00:38:07.000000000 +0100 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2011-06-13 15:12:16.477040613 +0100 @@ -59,12 +59,12 @@ # C Flags # @@ -328,7 +328,7 @@ # and use alternative implementations in C. diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h --- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-07-29 21:56:11.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-04-21 09:00:44.697761341 +0100 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-06-13 15:12:16.477040613 +0100 @@ -89,11 +89,7 @@ // bytes and byte arrays @@ -343,7 +343,7 @@ typedef DWORDLONG julong; diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c --- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2010-07-29 21:56:11.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2011-04-21 09:00:44.697761341 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2011-06-13 15:12:16.477040613 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -355,7 +355,7 @@ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c --- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2010-07-29 21:56:11.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2011-04-21 09:00:44.697761341 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2011-06-13 15:12:16.477040613 +0100 @@ -29,7 +29,7 @@ #include "jni.h" @@ -366,8 +366,8 @@ #include "java_util_zip_CRC32.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2011-03-14 22:10:33.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2011-04-21 09:00:44.697761341 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2011-06-11 00:38:12.000000000 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2011-06-13 15:12:16.481040676 +0100 @@ -32,7 +32,7 @@ #include "jlong.h" #include "jni.h" @@ -378,8 +378,8 @@ #include "java_util_zip_Deflater.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2011-03-14 22:10:33.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2011-04-21 09:00:44.697761341 +0100 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2011-06-11 00:38:12.000000000 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2011-06-13 15:12:16.481040676 +0100 @@ -35,7 +35,7 @@ #include "jni.h" #include "jvm.h" @@ -388,10 +388,10 @@ +#include <zlib.h> #include "java_util_zip_Inflater.h" - #define MIN2(x, y) ((x) < (y) ? (x) : (y)) + #define ThrowDataFormatException(env, msg) \ diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c --- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2011-03-14 22:10:33.000000000 +0000 -+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2011-04-21 09:00:44.697761341 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2011-06-13 15:12:16.481040676 +0100 @@ -44,7 +44,8 @@ #include "io_util.h" #include "io_util_md.h" @@ -403,8 +403,8 @@ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */ #ifdef USE_MMAP diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2011-04-21 09:00:44.697761341 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2011-06-11 00:38:12.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2011-06-13 15:12:16.481040676 +0100 @@ -51,7 +51,9 @@ /* headers from the JPEG library */ @@ -956,8 +956,8 @@ if (scale != NULL) { diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2011-04-21 09:00:44.697761341 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2011-06-11 00:38:12.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2011-06-13 15:12:16.481040676 +0100 @@ -45,7 +45,9 @@ #undef boolean #undef FAR @@ -1221,7 +1221,7 @@ * Here we postpone it until after no more JPEG errors are possible, diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2011-03-14 22:10:33.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2011-04-21 09:00:44.701761405 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2011-06-13 15:12:16.481040676 +0100 @@ -26,7 +26,7 @@ #include "splashscreen_impl.h" #include "splashscreen_gfx.h" @@ -1233,7 +1233,7 @@ #define GIF_USER_INPUT 0x02 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2010-07-29 21:56:12.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2011-04-21 09:00:44.701761405 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2011-06-13 15:12:16.481040676 +0100 @@ -25,9 +25,8 @@ #include "splashscreen_impl.h" @@ -1265,7 +1265,7 @@ src = (stream_src_ptr) cinfo->src; diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2011-03-14 22:10:33.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2011-04-21 09:00:44.701761405 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2011-06-13 15:12:16.481040676 +0100 @@ -25,7 +25,7 @@ #include "splashscreen_impl.h"
--- a/patches/linker-libs-order.patch Mon Jun 06 15:30:31 2011 +0200 +++ b/patches/linker-libs-order.patch Fri Jun 24 19:07:40 2011 +0100 @@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile ---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2010-09-01 10:55:50.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-09-01 15:54:07.312808721 +0100 -@@ -75,12 +75,12 @@ +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2011-06-13 15:19:20.000000000 +0100 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2011-06-13 15:21:25.281602536 +0100 +@@ -70,12 +70,12 @@ $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) @@ -16,7 +16,7 @@ CXXFLAGS_DBG += -DFULL CXXFLAGS_OPT += -DPRODUCT CXXFLAGS_COMMON += -DFULL -@@ -97,12 +97,11 @@ +@@ -92,12 +92,11 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space @@ -31,19 +31,19 @@ endif endif #LINUX endif #PLATFORM -@@ -148,7 +147,7 @@ - - $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) updatefiles winres +@@ -150,7 +149,7 @@ $(prep-target) + $(RM) $(TEMPDIR)/mapfile-vers + $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers - $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) + $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) ifdef MT $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif diff -Nru openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile ---- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2010-07-29 21:55:27.000000000 +0100 -+++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2010-09-01 15:54:07.312808721 +0100 -@@ -66,7 +66,7 @@ +--- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2011-06-11 00:38:06.000000000 +0100 ++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2011-06-13 15:20:50.441058241 +0100 +@@ -65,7 +65,7 @@ $(MIDIFILES_export) \ $(PORTFILES_export)
--- a/patches/rmi_amd64.patch Mon Jun 06 15:30:31 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---- ../openjdk/jdk/make/sun/rmi/rmi/Makefile 2007-08-16 03:17:52.000000000 -0400 -+++ openjdk/jdk/make/sun/rmi/rmi/Makefile 2007-08-30 12:36:07.000000000 -0400 -@@ -88,12 +88,8 @@ - ifeq ($(PLATFORM), windows) - build: stubs - else # PLATFORM --ifneq ($(ARCH_DATA_MODEL), 32) --build: stubs --else # ARCH_DATA_MODEL - build: stubs bin - endif --endif - - clean clobber:: bin.clean -
--- a/patches/testenv.patch Mon Jun 06 15:30:31 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -diff -Nru openjdk.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java openjdk/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java ---- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2010-07-29 21:56:30.000000000 +0100 -+++ openjdk/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2010-09-01 16:45:06.244592103 +0100 -@@ -39,7 +39,7 @@ - static void test1() throws Exception { - InetAddress bogus = InetAddress.getByName("0.0.0.0"); - InetSocketAddress saddr = new InetSocketAddress( -- InetAddress.getByName(TestUtil.HOST), 23); -+ InetAddress.getByName(TestUtil.HOST), 7); - - //Test1: connect only - SocketChannel sc = SocketChannel.open(); -diff -Nru openjdk.orig/jdk/test/java/nio/channels/TestUtil.java openjdk/jdk/test/java/nio/channels/TestUtil.java ---- openjdk.orig/jdk/test/java/nio/channels/TestUtil.java 2010-07-29 21:56:30.000000000 +0100 -+++ openjdk/jdk/test/java/nio/channels/TestUtil.java 2010-09-01 16:45:06.244592103 +0100 -@@ -36,9 +36,9 @@ - - // Test hosts used by the channels tests - change these when - // executing in a different network. -- public static final String HOST = "javaweb.sfbay.sun.com"; -- public static final String REFUSING_HOST = "jano1.sfbay.sun.com"; -- public static final String FAR_HOST = "irejano.ireland.sun.com"; -+ public static final String HOST = "icedtea.classpath.org"; -+ public static final String REFUSING_HOST = "ns1.gnu.org"; -+ public static final String FAR_HOST = "developer.classpath.org"; - public static final String UNRESOLVABLE_HOST = "blah-blah.blah-blah.blah"; - - private TestUtil() { } -diff -Nru openjdk.orig/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh openjdk/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh ---- openjdk.orig/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh 2010-07-29 21:56:39.000000000 +0100 -+++ openjdk/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh 2010-09-01 16:45:06.252591410 +0100 -@@ -26,14 +26,14 @@ - - # @test - # @bug 4763315 --# @build CanonicalName Lookup -+# @build CanonicalName Lookup - # @run shell/timeout=120 cname.sh - # @summary Test DNS provider's handling of CNAME records - - - # The host that we try to resolve - --HOST=webcache.sfbay.sun.com -+HOST=developer.classpath.org - - # fail gracefully if DNS is not configured or there - # isn't a CNAME record.