Mercurial > hg > release > icedtea7-2.0
changeset 2454:71fb0f9294cb
Bump to b147.
2011-07-13 Andrew John Hughes <ahughes@redhat.com>
Bump to b147.
* Makefile.am:
(OPENJDK_VERSION): Bumped to b147.
(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.
(bootstrap-directory-stage1): Use our
script for javah.
* configure.ac:
Generate script for javah.
* javah.in: Filter -X commands from javah.
* patches/boot/ecj-autoboxing.patch:
Updated to apply against b147.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-stringswitch.patch:
Likewise and add new cases.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 13 Jul 2011 22:13:02 +0100 |
| parents | c3bc27e0ae44 |
| children | 76c688f49231 |
| files | ChangeLog Makefile.am configure.ac javah.in patches/boot/ecj-autoboxing.patch patches/boot/ecj-diamond.patch patches/boot/ecj-stringswitch.patch |
| diffstat | 7 files changed, 1207 insertions(+), 1192 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 12 11:32:03 2011 +0100 +++ b/ChangeLog Wed Jul 13 22:13:02 2011 +0100 @@ -1,3 +1,37 @@ +2011-07-13 Andrew John Hughes <ahughes@redhat.com> + + Bump to b147. + * Makefile.am: + (OPENJDK_VERSION): Bumped to b147. + (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. + (bootstrap-directory-stage1): Use our + script for javah. + * configure.ac: + Generate script for javah. + * javah.in: Filter -X commands from javah. + * patches/boot/ecj-autoboxing.patch: + Updated to apply against b147. + * patches/boot/ecj-diamond.patch, + * patches/boot/ecj-stringswitch.patch: + Likewise and add new cases. + 2011-07-12 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Tue Jul 12 11:32:03 2011 +0100 +++ b/Makefile.am Wed Jul 13 22:13:02 2011 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b143 +OPENJDK_VERSION = b147 -CORBA_CHANGESET = 279c876d1001 -HOTSPOT_CHANGESET = f7e8b10f51c6 -JAXP_CHANGESET = d8cdc48a42bd -JAXWS_CHANGESET = e514ae6ec042 -JDK_CHANGESET = d28f54a421b1 -LANGTOOLS_CHANGESET = 1316e51b3995 -OPENJDK_CHANGESET = 2108c94c0d3d +CORBA_CHANGESET = 616c760dc288 +HOTSPOT_CHANGESET = 6844f4ba31ea +JAXP_CHANGESET = c40983d6ae70 +JAXWS_CHANGESET = 83db5e316798 +JDK_CHANGESET = 483d8dacfbd8 +LANGTOOLS_CHANGESET = 0df09c966a29 +OPENJDK_CHANGESET = 3defd24c2671 -CORBA_SHA256SUM = c13569b05931c858c0bb999e160aa89208b507ce5591b068d9b8b672fba34b19 -HOTSPOT_SHA256SUM = 6fd67e0875b0dbba01b0162c1660deee7642b53acd7358bc207f09ff5a2ad828 -JAXP_SHA256SUM = 5cbc5f855815cc327fc59452c87116521c2417d7bcbe42229fbb0f7a872dc691 -JAXWS_SHA256SUM = 9695be9ec5d394bd9212093f03c4064ce4cf29119163e66944692976700a1956 -JDK_SHA256SUM = 7fa59b0e0d803b603c176b1b1d34375adb417567e31a3735e6e229810266f027 -LANGTOOLS_SHA256SUM = 41d51de84b8865718fa9085f76bb2f64a2ec5af03d458a7fd2cf49c2fd5e4d7e -OPENJDK_SHA256SUM = adb23e8fe1e2e4fd2f34cfdf57ede78aa3e6f983af113bb8fd7dfe073f343d17 +CORBA_SHA256SUM = da786a16483ba20113f570284c242cfede65e76e6c8911ad4a238cdc33cbf48d +HOTSPOT_SHA256SUM = 0d5e9b17972e5688e1ec176c25d0055047ed198a804906bcc4cf9993c9a6c118 +JAXP_SHA256SUM = f8416413f66a5b49214b582391c0a00a2ff9487c42965f37e63fd48a89eedb1d +JAXWS_SHA256SUM = 54803ffb5f4badb119c488bc90670661fd9c7049f32ae94668c38bf85e709047 +JDK_SHA256SUM = aa99e5b5e3ee7cb7bf94e90b2fb1bd45382548d620614acbb6621234698b7929 +LANGTOOLS_SHA256SUM = 991fc492c08a51163dd54c3cd247764f1b3986a88a77042c137a5a0c1fac4b1e +OPENJDK_SHA256SUM = 653d459911cae04907adeb1c1c5926c0ff1d874127ad16d72324cba63975f57b 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_4-b02-2011_05_09.zip -JAXWS_DROP_SHA256SUM = 2fd874aae97a4206c8f4cd93ee419c09f95c3f684349182b66b6ee9010c72f84 +JAXWS_DROP_ZIP = jdk7-jaxws2_2_4-b03-2011_05_27.zip +JAXWS_DROP_SHA256SUM = 05ae7259b75d0f2307276d61ece1887fcd437cb4ecda42fab8c22d4b537effd6 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.zip -JAXP_DROP_SHA256SUM = 8145a789a61d21d0ff9902e4dc1c7ba492bb407ee614187dc933321922249ddb +JAXP_DROP_ZIP = jaxp145_01.zip +JAXP_DROP_SHA256SUM = c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb ICEDTEA_PREFIX = icedtea7-forest ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) @@ -1671,7 +1671,7 @@ stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp mkdir -p $(STAGE1_BOOT_DIR)/bin stamps/ ln -sf $(JAVA) $(STAGE1_BOOT_DIR)/bin/java - ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah + ln -sf ../../../javah $(STAGE1_BOOT_DIR)/bin/javah ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
--- a/configure.ac Tue Jul 12 11:32:03 2011 +0100 +++ b/configure.ac Wed Jul 13 22:13:02 2011 +0100 @@ -107,6 +107,7 @@ fi AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) +AC_CONFIG_FILES([javah], [chmod +x javah]) IT_JAVAH IT_LIBRARY_CHECK
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/javah.in Wed Jul 13 22:13:02 2011 +0100 @@ -0,0 +1,4 @@ +#!/usr/bin/perl -w +use strict; + +exec '@JAVAH@', (grep !/^-X/, @ARGV) ;
--- a/patches/boot/ecj-autoboxing.patch Tue Jul 12 11:32:03 2011 +0100 +++ b/patches/boot/ecj-autoboxing.patch Wed Jul 13 22:13:02 2011 +0100 @@ -1,7 +1,7 @@ -diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/CallSite.java ---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Sat Apr 30 02:38:41 2011 +0100 -@@ -309,7 +309,7 @@ +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/CallSite.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/CallSite.java 2011-07-12 12:43:47.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java 2011-07-12 15:12:13.210932096 +0100 +@@ -329,7 +329,7 @@ private static Object maybeReBox(Object x) { if (x instanceof Integer) { @@ -10,10 +10,10 @@ if (xi == (byte) xi) x = xi; // must rebox; see JLS 5.1.7 } -diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/FromGeneric.java ---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Sat Apr 30 02:38:41 2011 +0100 -@@ -502,10 +502,10 @@ +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/FromGeneric.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/FromGeneric.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java 2011-07-12 15:12:13.210932096 +0100 +@@ -505,10 +505,10 @@ protected A0 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A0(e, i, c, t); } protected Object invoke_L0() throws Throwable { return convert_L((Object)invoker.invokeExact(target)); } @@ -28,7 +28,7 @@ } static class A1 extends Adapter { protected A1(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -514,10 +514,10 @@ +@@ -517,10 +517,10 @@ protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A1(e, i, c, t); } protected Object invoke_L1(Object a0) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0)); } @@ -43,7 +43,7 @@ } static class A2 extends Adapter { protected A2(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -526,10 +526,10 @@ +@@ -529,10 +529,10 @@ protected A2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A2(e, i, c, t); } protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1)); } @@ -58,7 +58,7 @@ } static class A3 extends Adapter { protected A3(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -538,10 +538,10 @@ +@@ -541,10 +541,10 @@ protected A3 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A3(e, i, c, t); } protected Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2)); } @@ -73,7 +73,7 @@ } static class A4 extends Adapter { protected A4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -550,10 +550,10 @@ +@@ -553,10 +553,10 @@ protected A4 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A4(e, i, c, t); } protected Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3)); } @@ -88,7 +88,7 @@ } static class A5 extends Adapter { protected A5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -562,10 +562,10 @@ +@@ -565,10 +565,10 @@ protected A5 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A5(e, i, c, t); } protected Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4)); } @@ -103,7 +103,7 @@ } static class A6 extends Adapter { protected A6(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -574,10 +574,10 @@ +@@ -577,10 +577,10 @@ protected A6 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A6(e, i, c, t); } protected Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } @@ -118,7 +118,7 @@ } static class A7 extends Adapter { protected A7(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -586,10 +586,10 @@ +@@ -589,10 +589,10 @@ protected A7 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A7(e, i, c, t); } protected Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } @@ -133,7 +133,7 @@ } static class A8 extends Adapter { protected A8(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -598,10 +598,10 @@ +@@ -601,10 +601,10 @@ protected A8 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A8(e, i, c, t); } protected Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } @@ -148,7 +148,7 @@ } static class A9 extends Adapter { protected A9(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -610,10 +610,10 @@ +@@ -613,10 +613,10 @@ protected A9 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A9(e, i, c, t); } protected Object invoke_L9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } @@ -163,7 +163,7 @@ } static class A10 extends Adapter { protected A10(MethodHandle entryPoint) { super(entryPoint); } // to build prototype -@@ -622,9 +622,9 @@ +@@ -625,9 +625,9 @@ protected A10 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A10(e, i, c, t); } protected Object invoke_L10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } @@ -177,10 +177,10 @@ + protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } } } -diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/MethodHandleImpl.java ---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Sat Apr 30 02:38:41 2011 +0100 -@@ -832,52 +832,52 @@ +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2011-07-12 12:43:47.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2011-07-12 15:12:13.214932157 +0100 +@@ -956,52 +956,52 @@ return addTypeString(target, this); } private Object invoke_V(Object... av) throws Throwable { @@ -243,10 +243,10 @@ return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); } -diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/ToGeneric.java ---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Sat Apr 30 02:38:41 2011 +0100 -@@ -390,10 +390,10 @@ +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/ToGeneric.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/ToGeneric.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java 2011-07-12 15:12:13.214932157 +0100 +@@ -394,10 +394,10 @@ // Code to run when the generic target has finished and produced a value. protected Object return_L(Object res) throws Throwable { return (Object)convert.invokeExact(res); } @@ -261,22 +261,22 @@ 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 @@ +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2011-07-12 14:52:51.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2011-07-12 15:12:50.499499088 +0100 +@@ -223,9 +223,9 @@ if (x instanceof Number) { res = (Number) x; } else if (x instanceof Boolean) { -- res = ((boolean)x ? 1 : 0); -+ res = ((Boolean)x ? 1 : 0); +- res = ((boolean)x ? ONE_INT : ZERO_INT); ++ res = ((Boolean)x ? ONE_INT : ZERO_INT); } 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 @@ +@@ -386,7 +386,7 @@ static int unboxRawInteger(Object x) { if (x instanceof Integer)
--- a/patches/boot/ecj-diamond.patch Tue Jul 12 11:32:03 2011 +0100 +++ b/patches/boot/ecj-diamond.patch Wed Jul 13 22:13:02 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-06-14 02:06:39.313002689 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-07-12 16:56:06.686259706 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-07-12 16:56:06.702259970 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-12 16:56:06.702259970 +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-06-14 02:06:39.329002971 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-07-12 16:56:06.702259970 +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-06-14 02:06:39.329002971 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-07-12 16:56:06.702259970 +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-06-14 02:06:39.329002971 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-07-12 16:56:06.702259970 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-12 16:56:06.702259970 +0100 @@ -59,7 +59,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -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-06-14 02:06:39.329002971 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-07-12 16:56:06.702259970 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-12 16:56:06.702259970 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-07-12 16:56:06.702259970 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-07-12 16:56:06.706260036 +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-06-14 02:06:39.333003042 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-07-12 16:56:06.710260102 +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-06-14 02:06:39.333003042 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-07-12 16:56:06.714260168 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-07-12 16:56:06.714260168 +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-06-14 02:06:39.333003042 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-07-12 16:56:06.714260168 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-07-12 16:56:06.714260168 +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-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 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-07-12 16:56:06.714260168 +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-06-14 02:06:39.333003042 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-07-12 16:56:06.714260168 +0100 @@ -135,7 +135,7 @@ throw new ConfigurationException("DNS pseudo-URL required"); } @@ -741,9 +741,42 @@ for (int i = 0; i < urls.length; i++) { String server = urls[i].getHost(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2011-07-12 16:56:06.822261957 +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 -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2011-07-12 16:56:06.866262683 +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); 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-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 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-07-12 16:56:06.714260168 +0100 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -759,7 +792,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-07-12 16:56:06.714260168 +0100 @@ -152,7 +152,7 @@ // new configuration @@ -789,7 +822,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-07-12 16:56:06.714260168 +0100 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -801,7 +834,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-07-12 16:56:06.714260168 +0100 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -813,7 +846,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-07-12 16:56:06.714260168 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -825,7 +858,7 @@ * 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-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 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2011-07-12 16:56:06.714260168 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -837,7 +870,7 @@ * 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-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 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2011-07-12 16:56:06.714260168 +0100 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -849,7 +882,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2011-07-12 16:56:06.714260168 +0100 @@ -34,7 +34,7 @@ */ @@ -870,7 +903,7 @@ // 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2011-07-12 16:56:06.714260168 +0100 @@ -57,7 +57,7 @@ private volatile boolean closed = false; @@ -882,7 +915,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2011-07-12 16:56:06.714260168 +0100 @@ -1082,7 +1082,7 @@ if ((names == null) || (filter == null)) { return names; @@ -912,7 +945,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2011-07-12 16:56:06.714260168 +0100 @@ -70,7 +70,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -924,7 +957,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2011-07-12 16:56:06.714260168 +0100 @@ -725,7 +725,7 @@ */ @@ -954,7 +987,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-06-14 02:06:39.337003113 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2011-07-12 16:56:06.718260234 +0100 @@ -213,7 +213,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -980,7 +1013,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-06-14 02:06:39.341003184 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2011-07-12 16:56:06.718260234 +0100 @@ -165,11 +165,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1006,7 +1039,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2011-07-12 16:56:06.718260234 +0100 @@ -84,18 +84,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1088,7 +1121,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2011-07-12 16:56:06.718260234 +0100 @@ -47,7 +47,7 @@ } } @@ -1100,7 +1133,7 @@ // 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2011-07-12 16:56:06.718260234 +0100 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1122,7 +1155,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-06-14 02:06:39.349003326 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2011-07-12 16:56:06.718260234 +0100 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1134,7 +1167,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2011-07-12 16:56:06.722260300 +0100 @@ -1308,7 +1308,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -1230,7 +1263,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2011-07-12 16:56:06.722260300 +0100 @@ -246,7 +246,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1337,9 +1370,9 @@ 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-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 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2011-07-12 16:56:06.722260300 +0100 +@@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { Set<Class<? extends PlatformManagedObject>> result = @@ -1350,7 +1383,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2011-07-12 16:56:06.722260300 +0100 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -1388,8 +1421,8 @@ // Use String as the key rather than Class<?> to avoid // causing unnecessary class loading of management interface diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 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 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2011-07-12 16:56:06.722260300 +0100 @@ -596,13 +596,16 @@ } @@ -1412,7 +1445,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2011-07-12 16:56:06.722260300 +0100 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1433,7 +1466,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2011-07-12 16:56:06.722260300 +0100 @@ -136,7 +136,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1445,7 +1478,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2011-07-12 16:56:06.722260300 +0100 @@ -232,7 +232,7 @@ /** maps a class loader to the proxy class cache for that loader */ @@ -1475,7 +1508,7 @@ /* 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2011-07-12 16:56:06.722260300 +0100 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1487,7 +1520,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2011-07-12 16:56:06.722260300 +0100 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -1502,7 +1535,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2011-07-12 16:56:06.722260300 +0100 @@ -2330,7 +2330,7 @@ int off = 0; int next = 0; @@ -1514,7 +1547,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2011-07-12 16:56:06.726260366 +0100 @@ -1616,7 +1616,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -1541,7 +1574,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2011-07-12 16:56:06.726260366 +0100 @@ -917,7 +917,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -1561,8 +1594,8 @@ suppressedExceptions.add(exception); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java ---- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 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 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2011-07-12 12:43:47.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2011-07-12 16:56:06.726260366 +0100 @@ -677,7 +677,7 @@ static InetAddressImpl impl; @@ -1583,7 +1616,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2011-07-12 16:56:06.726260366 +0100 @@ -205,7 +205,7 @@ */ @@ -1594,8 +1627,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-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 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2011-07-12 16:56:06.726260366 +0100 @@ -1487,7 +1487,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -1616,7 +1649,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2011-07-12 16:56:06.726260366 +0100 @@ -124,7 +124,7 @@ this.context = null; } @@ -1628,7 +1661,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2011-07-12 16:56:06.726260366 +0100 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -1640,7 +1673,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-06-14 02:06:39.369003681 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2011-07-12 16:56:06.726260366 +0100 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -1665,7 +1698,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2011-07-12 16:56:06.726260366 +0100 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -1686,7 +1719,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2011-07-12 16:56:06.726260366 +0100 @@ -368,8 +368,8 @@ int swag = 32; int vcap = 8; @@ -1700,7 +1733,7 @@ // 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2011-07-12 16:56:06.730260432 +0100 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -1730,7 +1763,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2011-07-12 16:56:06.730260432 +0100 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -1742,7 +1775,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2011-07-12 16:56:06.730260432 +0100 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -1790,7 +1823,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2011-07-12 16:56:06.730260432 +0100 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -1829,7 +1862,7 @@ // 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2011-07-12 16:56:06.730260432 +0100 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -1841,7 +1874,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-06-14 02:06:39.373003752 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2011-07-12 16:56:06.730260432 +0100 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -1872,7 +1905,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2011-07-12 16:56:06.730260432 +0100 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -1884,7 +1917,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2011-07-12 16:56:06.750260766 +0100 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -2511,7 +2544,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2011-07-12 16:56:06.750260766 +0100 @@ -500,7 +500,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -2523,7 +2556,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2011-07-12 16:56:06.750260766 +0100 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -2546,8 +2579,8 @@ // readObject method for the serialization proxy pattern diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java openjdk-boot/jdk/src/share/classes/java/util/Formatter.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 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 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2011-07-12 16:56:06.750260766 +0100 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -2559,7 +2592,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2011-07-12 16:56:06.750260766 +0100 @@ -763,7 +763,7 @@ */ void addEntry(int hash, K key, V value, int bucketIndex) { @@ -2580,7 +2613,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2011-07-12 16:56:06.750260766 +0100 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -2628,7 +2661,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2011-07-12 16:56:06.754260831 +0100 @@ -455,7 +455,7 @@ // Creates the new entry. @@ -2685,7 +2718,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2011-07-12 16:56:06.754260831 +0100 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -2706,7 +2739,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2011-07-12 16:56:06.754260831 +0100 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -2718,7 +2751,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2011-07-12 16:56:06.754260831 +0100 @@ -237,7 +237,7 @@ * the chain. */ @@ -2739,7 +2772,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2011-07-12 16:56:06.754260831 +0100 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -2778,7 +2811,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-06-14 02:06:39.377003822 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2011-07-12 16:56:06.754260831 +0100 @@ -187,7 +187,7 @@ return; @@ -2788,9 +2821,21 @@ for (int i = 0; i < contents.length; ++i) { // key must be non-null String, value must be non-null String key = (String) contents[i][0]; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java openjdk-boot/jdk/src/share/classes/java/util/Locale.java +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2011-07-12 16:56:06.818261891 +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 -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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2011-07-12 16:56:06.754260831 +0100 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -2802,7 +2847,7 @@ // (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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2011-07-12 16:56:06.754260831 +0100 @@ -59,7 +59,7 @@ */ @@ -2814,7 +2859,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2011-07-12 16:56:06.754260831 +0100 @@ -170,7 +170,7 @@ private LogManager manager; private String name; @@ -2835,7 +2880,7 @@ // 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2011-07-12 16:56:06.754260831 +0100 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -2847,7 +2892,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2011-07-12 16:56:06.754260831 +0100 @@ -156,7 +156,8 @@ private final static Level defaultLevel = Level.INFO; @@ -2887,7 +2932,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-06-14 02:06:39.381003892 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2011-07-12 16:56:06.754260831 +0100 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -2900,7 +2945,7 @@ * @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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2011-07-12 16:56:06.758260897 +0100 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -2932,7 +2977,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-06-14 02:06:39.381003892 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2011-07-12 16:56:06.758260897 +0100 @@ -538,7 +538,7 @@ cursor--; else { @@ -2944,7 +2989,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2011-07-12 16:56:06.758260897 +0100 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -2956,7 +3001,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2011-07-12 16:56:06.758260897 +0100 @@ -1193,7 +1193,7 @@ public String[] split(CharSequence input, int limit) { int index = 0; @@ -2984,9 +3029,23 @@ static { // Unicode character property aliases, defined in +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2011-07-12 16:56:06.818261891 +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 -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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2011-07-12 16:56:06.758260897 +0100 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -2996,9 +3055,75 @@ } private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2011-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2011-07-12 16:56:06.818261891 +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 -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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2011-07-12 16:56:06.758260897 +0100 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3028,7 +3153,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2011-07-12 16:56:06.758260897 +0100 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3040,7 +3165,7 @@ // 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2011-07-12 16:56:06.758260897 +0100 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3097,7 +3222,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-06-14 02:06:39.381003892 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2011-07-12 16:56:06.758260897 +0100 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3166,7 +3291,7 @@ // 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2011-07-12 16:56:06.762260963 +0100 @@ -171,7 +171,7 @@ /** * Reference queue for cleared WeakEntries @@ -3200,7 +3325,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-07-12 16:56:06.762260963 +0100 @@ -319,7 +319,7 @@ // the outstanding inputstreams that need to be closed, @@ -3230,7 +3355,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2011-07-12 16:56:06.762260963 +0100 @@ -53,8 +53,8 @@ } @@ -3244,7 +3369,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2011-07-12 16:56:06.762260963 +0100 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -3256,7 +3381,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2011-07-12 16:56:06.762260963 +0100 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -3268,7 +3393,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2011-07-12 16:56:06.762260963 +0100 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -3280,7 +3405,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2011-07-12 16:56:06.762260963 +0100 @@ -48,7 +48,7 @@ private Subject subject; @@ -3290,9 +3415,48 @@ private Set<Principal> principalSet; private Principal[] principals; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2011-07-12 16:56:06.818261891 +0100 +@@ -59,7 +59,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; + } + +@@ -1013,7 +1013,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; +@@ -1059,7 +1059,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); +@@ -1214,7 +1214,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 -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-06-14 02:06:39.385003963 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2011-07-12 16:56:06.762260963 +0100 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -3304,7 +3468,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-06-14 02:06:39.385003963 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2011-07-12 16:56:06.762260963 +0100 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -3315,8 +3479,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-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 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-07-12 16:56:06.762260963 +0100 @@ -169,7 +169,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -3335,9 +3499,21 @@ for (Locale l : tlocales) { sortedSet.add(l.toString()); } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2011-06-11 00:38:09.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2011-07-12 16:56:06.818261891 +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 -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-06-14 02:06:39.385003963 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2011-07-12 16:56:06.762260963 +0100 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -3367,7 +3543,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-06-14 02:06:39.385003963 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2011-07-12 16:56:06.762260963 +0100 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -3379,7 +3555,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-06-14 02:06:39.385003963 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2011-07-12 16:56:06.762260963 +0100 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -3418,7 +3594,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2011-07-12 16:56:06.762260963 +0100 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -3430,7 +3606,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2011-07-12 16:56:06.762260963 +0100 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -3444,7 +3620,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2011-07-12 16:56:06.762260963 +0100 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -3456,7 +3632,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2011-07-12 16:56:06.762260963 +0100 @@ -77,7 +77,7 @@ throws IOException { @@ -3477,7 +3653,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2011-07-12 16:56:06.762260963 +0100 @@ -71,7 +71,7 @@ @Override @@ -3489,7 +3665,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2011-07-12 16:56:06.762260963 +0100 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -3508,9 +3684,38 @@ for (E e: elements) { set.add(e); } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2011-07-12 16:56:06.862262617 +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 -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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2011-07-12 16:56:06.766261029 +0100 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -3522,7 +3727,7 @@ /** 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2011-07-12 16:56:06.766261029 +0100 @@ -41,15 +41,15 @@ // or principal. // @@ -3564,7 +3769,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2011-07-12 16:56:06.766261029 +0100 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -3585,7 +3790,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2011-07-12 16:56:06.766261029 +0100 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -3624,7 +3829,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2011-07-12 16:56:06.766261029 +0100 @@ -40,7 +40,7 @@ public class Providers { @@ -3634,9 +3839,21 @@ // number of threads currently using thread-local provider lists // tracked to allow an optimization if == 0 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2011-07-12 16:56:06.862262617 +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 -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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2011-07-12 16:56:06.766261029 +0100 @@ -527,7 +527,7 @@ } }))); @@ -3715,7 +3932,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2011-07-12 16:56:06.774261161 +0100 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3727,7 +3944,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2011-07-12 16:56:06.774261161 +0100 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3739,7 +3956,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2011-07-12 16:56:06.774261161 +0100 @@ -490,7 +490,7 @@ private static String exec(String c) { @@ -3751,7 +3968,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2011-07-12 16:56:06.774261161 +0100 @@ -257,7 +257,7 @@ + configName); } @@ -3763,7 +3980,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2011-07-12 16:56:06.774261161 +0100 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3775,7 +3992,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2011-07-12 16:56:06.774261161 +0100 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -3796,7 +4013,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2011-07-12 16:56:06.774261161 +0100 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -3826,7 +4043,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2011-07-12 16:56:06.774261161 +0100 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -3838,7 +4055,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2011-07-12 16:56:06.778261227 +0100 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -3850,7 +4067,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2011-07-12 16:56:06.778261227 +0100 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -3862,7 +4079,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2011-07-12 16:56:06.778261227 +0100 @@ -260,7 +260,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -3873,8 +4090,8 @@ // read the PA-DATA DerValue tmp = derPA.data.getDerValue(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 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 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2011-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2011-07-12 16:56:06.778261227 +0100 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -3893,7 +4110,7 @@ /** * Constructs a KeyTab object. -@@ -276,7 +276,7 @@ +@@ -280,7 +280,7 @@ KeyTabEntry entry; EncryptionKey key; int size = entries.size(); @@ -3902,7 +4119,7 @@ for (int i = size-1; i >= 0; i--) { entry = entries.elementAt(i); if (entry.service.match(service)) { -@@ -470,7 +470,7 @@ +@@ -482,7 +482,7 @@ int count = 0; // Remember the highest KVNO for each etype. Used for kvno == -2 @@ -3913,7 +4130,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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2011-07-12 16:56:06.778261227 +0100 @@ -77,7 +77,7 @@ */ @@ -3925,7 +4142,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2011-07-12 16:56:06.778261227 +0100 @@ -462,7 +462,7 @@ */ static class KdcAccessibility { @@ -3949,7 +4166,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2011-07-12 16:56:06.778261227 +0100 @@ -244,7 +244,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -3970,7 +4187,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2011-07-12 16:56:06.778261227 +0100 @@ -359,14 +359,14 @@ } @@ -3988,9 +4205,21 @@ tempList.add(sRealm); int count = 0; // For debug only +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2011-07-12 16:56:06.862262617 +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 -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-06-14 02:06:39.389004034 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2011-07-12 16:56:06.778261227 +0100 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -4001,8 +4230,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-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 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2011-07-12 12:43:47.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2011-07-12 16:56:06.778261227 +0100 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -4048,42 +4277,7 @@ i = 0; while (i < certs.length) { userCertList.add(certs[i]); -@@ -1790,27 +1790,27 @@ - - CodeSource canonCs = cs; - URL u = cs.getLocation(); -- -- // If this is a jar protocol url, collapse it to a -+ -+ // If this is a jar protocol url, collapse it to a - // file protocol to process it as per the javadocs - if (u != null && u.getProtocol().equals("jar")) { - try { - String fileURL = ""; -- -+ - // remove the initial jar: - fileURL = u.getPath(); -- -+ - // remove the part after the ! - fileURL = fileURL.substring(0, fileURL.indexOf('!')); -- -+ - u = new URL(fileURL); - - } catch (Exception e) { - // Fail silently. In this case, url stays what it was above - } -- -+ - } -- -+ - if (u != null && u.getProtocol().equals("file")) { - boolean isLocalFile = false; - String host = u.getHost(); -@@ -2252,7 +2252,7 @@ +@@ -2246,7 +2246,7 @@ if (this.certs == null) { // extract the signer certs ArrayList<Certificate> signerCerts = @@ -4094,7 +4288,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2011-07-12 16:56:06.778261227 +0100 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -4106,7 +4300,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2011-07-12 16:56:06.778261227 +0100 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4118,7 +4312,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2011-07-12 16:56:06.778261227 +0100 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -4165,7 +4359,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2011-07-12 16:56:06.778261227 +0100 @@ -219,7 +219,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -4177,7 +4371,7 @@ * 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2011-07-12 16:56:06.782261293 +0100 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4189,7 +4383,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2011-07-12 16:56:06.782261293 +0100 @@ -393,7 +393,7 @@ // Map BulkCipher -> Boolean(available) @@ -4201,7 +4395,7 @@ final String description; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java --- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2011-06-14 02:06:39.393004105 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2011-07-12 16:56:06.782261293 +0100 @@ -656,7 +656,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -4231,7 +4425,7 @@ cipherList.add(suite); 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2011-07-12 16:56:06.782261293 +0100 @@ -258,7 +258,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -4270,7 +4464,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2011-07-12 16:56:06.806261691 +0100 @@ -569,7 +569,7 @@ activeProtocols = getActiveProtocols(); } @@ -4291,7 +4485,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2011-07-12 16:56:06.806261691 +0100 @@ -169,7 +169,7 @@ return name; } @@ -4312,7 +4506,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2011-07-12 16:56:06.806261691 +0100 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -4324,7 +4518,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2011-07-12 16:56:06.806261691 +0100 @@ -153,7 +153,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -4363,7 +4557,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2011-07-12 16:56:06.806261691 +0100 @@ -261,7 +261,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -4409,9 +4603,30 @@ if(cipherSuite.keyExchange != null) { components.addAll( +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2011-06-11 00:38:10.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2011-07-12 16:56:06.862262617 +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 -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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2011-07-12 16:56:06.806261691 +0100 @@ -618,7 +618,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -4432,7 +4647,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2011-07-12 16:56:06.806261691 +0100 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -4453,7 +4668,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2011-07-12 16:56:06.806261691 +0100 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -4465,7 +4680,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2011-07-12 16:56:06.806261691 +0100 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -4486,7 +4701,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2011-07-12 16:56:06.810261758 +0100 @@ -123,14 +123,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -4569,7 +4784,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2011-07-12 16:56:06.810261758 +0100 @@ -152,11 +152,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -4641,7 +4856,7 @@ 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2011-07-12 16:56:06.810261758 +0100 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -4680,7 +4895,7 @@ } 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-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 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2011-07-12 16:56:06.810261758 +0100 @@ -94,7 +94,7 @@ * Run the converter */ @@ -4690,719 +4905,9 @@ File outputFile = null; 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-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. - private static Map<String,WeakReference<PlatformLogger>> loggers = -- new HashMap<>(); -+ new HashMap<String,WeakReference<PlatformLogger>>(); - - /** - * Returns a PlatformLogger of a given name. -@@ -126,7 +126,7 @@ - } - if (log == null) { - log = new PlatformLogger(name); -- loggers.put(name, new WeakReference<>(log)); -+ loggers.put(name, new WeakReference<PlatformLogger>(log)); - } - return log; - } -@@ -469,7 +469,7 @@ - */ - static class JavaLogger extends LoggerProxy { - private static final Map<Integer, Object> levelObjects = -- new HashMap<>(); -+ new HashMap<Integer, Object>(); - - 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-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]); -- Map<String, Object> env = env = new HashMap<>(); -+ Map<String, Object> env = env = new HashMap<String,Object>(); - if (action == Action.create) - env.put("create", "true"); - try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) { -@@ -647,9 +647,9 @@ - - private static void fchCopy(Path src, Path dst) throws IOException - { -- Set<OpenOption> read = new HashSet<>(); -+ Set<OpenOption> read = new HashSet<OpenOption>(); - read.add(READ); -- Set<OpenOption> openwrite = new HashSet<>(); -+ Set<OpenOption> openwrite = new HashSet<OpenOption>(); - openwrite.add(CREATE_NEW); - openwrite.add(WRITE); - -@@ -667,9 +667,9 @@ - - private static void chCopy(Path src, Path dst) throws IOException - { -- Set<OpenOption> read = new HashSet<>(); -+ Set<OpenOption> read = new HashSet<OpenOption>(); - read.add(READ); -- Set<OpenOption> openwrite = new HashSet<>(); -+ Set<OpenOption> openwrite = new HashSet<OpenOption>(); - openwrite.add(CREATE_NEW); - openwrite.add(WRITE); - -diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2011-03-14 22:10:33.000000000 +0000 -+++ 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()); - } - -- private final ThreadLocal<CharsetDecoder> decTL = new ThreadLocal<>(); -- private final ThreadLocal<CharsetEncoder> encTL = new ThreadLocal<>(); -+ private final ThreadLocal<CharsetDecoder> decTL = new ThreadLocal<CharsetDecoder>(); -+ private final ThreadLocal<CharsetEncoder> encTL = new ThreadLocal<CharsetEncoder>();r - - 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-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 - { - ZipFileAttributes zfas = readAttributes(); -- LinkedHashMap<String, Object> map = new LinkedHashMap<>(); -+ LinkedHashMap<String, Object> map = new LinkedHashMap<String,Object>(); - if ("*".equals(attributes)) { - 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-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 - public Iterable<Path> getRootDirectories() { -- ArrayList<Path> pathArr = new ArrayList<>(); -+ ArrayList<Path> pathArr = new ArrayList<Path>(); - pathArr.add(new ZipPath(this, new byte[]{'/'})); - return pathArr; - } -@@ -192,7 +192,7 @@ - - @Override - public Iterable<FileStore> getFileStores() { -- ArrayList<FileStore> list = new ArrayList<>(1); -+ ArrayList<FileStore> list = new ArrayList<FileStore>(1); - list.add(new ZipFileStore(new ZipPath(this, new byte[]{'/'}))); - return list; - } -@@ -258,7 +258,7 @@ - endWrite(); - } - if (!streams.isEmpty()) { // unlock and close all remaining streams -- Set<InputStream> copy = new HashSet<>(streams); -+ Set<InputStream> copy = new HashSet<InputStream>(streams); - for (InputStream is: copy) - is.close(); - } -@@ -386,7 +386,7 @@ - IndexNode inode = getInode(path); - if (inode == null) - throw new NotDirectoryException(getString(path)); -- List<Path> list = new ArrayList<>(); -+ List<Path> list = new ArrayList<Path>(); - IndexNode child = inode.child; - while (child != null) { - ZipPath zp = toZipPath(child.name); -@@ -815,7 +815,7 @@ - - // the ex-channel and ex-path that need to close when their outstanding - // input streams are all closed by the obtainers. -- private Set<ExChannelCloser> exChClosers = new HashSet<>(); -+ private Set<ExChannelCloser> exChClosers = new HashSet<ExChannelCloser>(); - - private Set<Path> tmppaths = Collections.synchronizedSet(new HashSet<Path>()); - private Path getTempPathForEntry(byte[] path) throws IOException { -@@ -1012,7 +1012,7 @@ - private byte[] initCEN() throws IOException { - end = findEND(); - if (end.endpos == 0) { -- inodes = new LinkedHashMap<>(10); -+ inodes = new LinkedHashMap<IndexNode,IndexNode>(10); - locpos = 0; - buildNodeTree(); - return null; // only END header present -@@ -1033,7 +1033,7 @@ - zerror("read CEN tables failed"); - } - // Iterate through the entries in the central directory -- inodes = new LinkedHashMap<>(end.centot + 1); -+ inodes = new LinkedHashMap<IndexNode,IndexNode>(end.centot + 1); - int pos = 0; - int limit = cen.length - ENDHDR; - while (pos < limit) { -@@ -1180,7 +1180,7 @@ - return; - Path tmpFile = createTempFileInSameDirectoryAs(zfpath); - OutputStream os = Files.newOutputStream(tmpFile, WRITE); -- ArrayList<Entry> elist = new ArrayList<>(inodes.size()); -+ ArrayList<Entry> elist = new ArrayList<Entry>(inodes.size()); - long written = 0; - byte[] buf = new byte[8192]; - Entry e = null; -@@ -1592,7 +1592,7 @@ - // Maxmum number of de/inflater we cache - private final int MAX_FLATER = 20; - // List of available Inflater objects for decompression -- private final List<Inflater> inflaters = new ArrayList<>(); -+ private final List<Inflater> inflaters = new ArrayList<Inflater>(); - - // Gets an inflater from the list of available inflaters or allocates - // a new one. -@@ -1621,7 +1621,7 @@ - } - - // List of available Deflater objects for compression -- private final List<Deflater> deflaters = new ArrayList<>(); -+ private final List<Deflater> deflaters = new ArrayList<Deflater>(); - - // Gets an deflater from the list of available deflaters or allocates - // a new one. -@@ -2331,7 +2331,7 @@ - private void buildNodeTree() throws IOException { - beginWrite(); - try { -- HashSet<IndexNode> dirs = new HashSet<>(); -+ HashSet<IndexNode> dirs = new HashSet<IndexNode>(); - IndexNode root = new IndexNode(ROOTPATH, -1); - 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-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 { - - -- private final Map<Path, ZipFileSystem> filesystems = new HashMap<>(); -+ private final Map<Path, ZipFileSystem> filesystems = new HashMap<Path,ZipFileSystem>(); - - 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-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. - byte[][] environ = environ(); -- theEnvironment = new HashMap<>(environ.length/2 + 3); -+ theEnvironment = new HashMap<Variable,Value>(environ.length/2 + 3); - // Read environment variables back to front, - // 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-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. - */ -- final List<Change> changeLog = new ArrayList<>(); -+ final List<Change> changeLog = new ArrayList<Change>(); - - /** - * Represents a change to a preference. -@@ -507,7 +507,7 @@ - }); - if (newNode) { - // These 2 things guarantee node will get wrtten at next flush/sync -- prefsCache = new TreeMap<>(); -+ prefsCache = new TreeMap<String, String>(); - nodeCreate = new NodeCreate(); - changeLog.add(nodeCreate); - } -@@ -550,7 +550,7 @@ - loadCache(); - } catch(Exception e) { - // assert lastSyncTime == 0; -- prefsCache = new TreeMap<>(); -+ prefsCache = new TreeMap<String, String>(); - } - } - -@@ -567,7 +567,7 @@ - AccessController.doPrivileged( - new PrivilegedExceptionAction<Void>() { - public Void run() throws BackingStoreException { -- Map<String, String> m = new TreeMap<>(); -+ Map<String, String> m = new TreeMap<String, String>(); - long newLastSyncTime = 0; - FileInputStream fis = null; - try { -@@ -581,7 +581,7 @@ - prefsFile.renameTo( new File( - prefsFile.getParentFile(), - "IncorrectFormatPrefs.xml")); -- m = new TreeMap<>(); -+ m = new TreeMap<String, String>(); - } else if (e instanceof FileNotFoundException) { - getLogger().warning("Prefs file removed in background " - + prefsFile.getPath()); -@@ -662,7 +662,7 @@ - return AccessController.doPrivileged( - new PrivilegedAction<String[]>() { - public String[] run() { -- List<String> result = new ArrayList<>(); -+ List<String> result = new ArrayList<String>(); - File[] dirContents = dir.listFiles(); - if (dirContents != null) { - for (int i = 0; i < dirContents.length; i++) -@@ -810,7 +810,7 @@ - } else if (lastSyncTime != 0 && !dir.exists()) { - // This node was removed in the background. Playback any changes - // against a virgin (empty) Map. -- prefsCache = new TreeMap<>(); -+ prefsCache = new TreeMap<String, String>(); - replayChanges(); - } - 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-06-14 02:06:46.977138425 +0100 -@@ -60,7 +60,7 @@ - int maxperkeyword, - int maxkeywords) - { -- LinkedList<String> ll = new LinkedList<>(); -+ LinkedList<String> ll = new LinkedList<String>(); - - try { - BufferedReader in = -@@ -200,7 +200,7 @@ - // no local domain so try fallback (RPC) domain or - // hostname - -- sl = new LinkedList<>(); -+ sl = new LinkedList<String>(); - String domain = fallbackDomain0(); - if (domain != null && domain.length() > 0) { - 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-06-14 02:06:46.977138425 +0100 -@@ -153,12 +153,12 @@ - - static { - HashMap<ControlSequence, String> tSequenceToEncodingMap = -- new HashMap<>(33, 1.0f); -+ new HashMap<ControlSequence, String>(33, 1.0f); - HashMap<ControlSequence, Boolean> tHighBitsMap = -- new HashMap<>(31, 1.0f); -+ new HashMap<ControlSequence, Boolean>(31, 1.0f); - HashMap<String, ControlSequence> tEncodingToSequenceMap = -- new HashMap<>(21, 1.0f); -- ArrayList<String> tEncodings = new ArrayList<>(21); -+ new HashMap<String, ControlSequence>(21, 1.0f); -+ ArrayList<String> tEncodings = new ArrayList<String>(21); - - 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-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(); - private static Set<String> supportedFileAttributeViews() { -- Set<String> result = new HashSet<>(); -+ Set<String> result = new HashSet<String>(); - result.addAll(standardFileAttributeViews()); - // additional Linux-specific views - result.add("dos"); -@@ -76,7 +76,7 @@ - * Returns object to iterate over the mount entries in the given fstab file. - */ - Iterable<UnixMountEntry> getMountEntries(String fstab) { -- ArrayList<UnixMountEntry> entries = new ArrayList<>(); -+ ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>(); - try { - 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-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. - private List<String> asList(long address, int size) { -- List<String> list = new ArrayList<>(); -+ List<String> list = new ArrayList<String>(); - int start = 0; - 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-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 - */ - private static List<AclEntry> decode(long address, int n) { -- ArrayList<AclEntry> acl = new ArrayList<>(n); -+ ArrayList<AclEntry> acl = new ArrayList<AclEntry>(n); - for (int i=0; i<n; i++) { - 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-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(); - private static Set<String> supportedFileAttributeViews() { -- Set<String> result = new HashSet<>(); -+ Set<String> result = new HashSet<String>(); - result.addAll(standardFileAttributeViews()); - // additional Solaris-specific views - result.add("acl"); -@@ -101,7 +101,7 @@ - */ - @Override - Iterable<UnixMountEntry> getMountEntries() { -- ArrayList<UnixMountEntry> entries = new ArrayList<>(); -+ ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>(); - try { - 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-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 @@ - } - - // read list of extended attributes -- List<String> list = new ArrayList<>(); -+ List<String> list = new ArrayList<String>(); - try { - 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-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() { - int bits = (st_mode & UnixConstants.S_IAMB); -- HashSet<PosixFilePermission> perms = new HashSet<>(); -+ HashSet<PosixFilePermission> perms = new HashSet<PosixFilePermission>(); - - 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-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)); - } - -- theCaseInsensitiveEnvironment = new TreeMap<>(nameComparator); -+ theCaseInsensitiveEnvironment -+ = new TreeMap<String,String>(nameComparator); - theCaseInsensitiveEnvironment.putAll(theEnvironment); - } - -@@ -295,7 +296,8 @@ - // Only for use by ProcessImpl.start() - String toEnvironmentBlock() { - // Sort Unicode-case-insensitively by name -- List<Map.Entry<String,String>> list = new ArrayList<>(entrySet()); -+ List<Map.Entry<String,String>> list -+ = new ArrayList<Map.Entry<String,String>>(entrySet()); - Collections.sort(list, entryComparator); - - 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-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 - private LinkedList<String> stringToList(String str) { -- LinkedList<String> ll = new LinkedList<>(); -+ LinkedList<String> ll = new LinkedList<String>(); - - // 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-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 -- ArrayList<Path> result = new ArrayList<>(); -+ ArrayList<Path> result = new ArrayList<Path>(); - SecurityManager sm = System.getSecurityManager(); - 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-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() { - if (offsets == null) { -- ArrayList<Integer> list = new ArrayList<>(); -+ ArrayList<Integer> list = new ArrayList<Integer>(); - if (isEmpty()) { - // 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-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(); - } -- ArrayList<AclEntry> result = new ArrayList<>(aceCount); -+ ArrayList<AclEntry> result = new ArrayList<AclEntry>(aceCount); - - // 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-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. - private List<String> listUsingStreamEnumeration() throws IOException { -- List<String> list = new ArrayList<>(); -+ List<String> list = new ArrayList<String>(); - try { - FirstStream first = FindFirstStream(file.getPathForWin32Calls()); - if (first != null) { -@@ -114,7 +114,7 @@ - NativeBuffer buffer = null; - - // result with names of alternative data streams -- final List<String> list = new ArrayList<>(); -+ final List<String> list = new ArrayList<String>(); - - try { - buffer = NativeBuffers.getNativeBuffer(BUFFER_SIZE); -@@ -216,7 +216,7 @@ - // wrap with channel - FileChannel fc = null; - try { -- Set<OpenOption> opts = new HashSet<>(); -+ Set<OpenOption> opts = new HashSet<OpenOption>(); - opts.add(READ); - if (!followLinks) - opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); -@@ -243,7 +243,7 @@ - // wrap with channel - FileChannel fc = null; - try { -- Set<OpenOption> opts = new HashSet<>(); -+ Set<OpenOption> opts = new HashSet<OpenOption>(); - opts.add(READ); - if (!followLinks) - opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); -@@ -298,7 +298,7 @@ - x.rethrowAsIOException(file); - } - try { -- Set<OpenOption> opts = new HashSet<>(); -+ Set<OpenOption> opts = new HashSet<OpenOption>(); - if (!followLinks) - 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-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"); - try { -- ArrayList<NPEProvoker> list = new ArrayList<>(); -+ ArrayList<NPEProvoker> list = new ArrayList<NPEProvoker>(); - list.add(new NPEProvoker()); - 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-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; - private final String methodName; -- private final Map<Integer,byte[]> snippets = new HashMap<>(); -+ private final Map<Integer,byte[]> snippets = new HashMap<Integer,byte[]>(); - - 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-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; - int tracker; -- List<Info> infoList = new ArrayList<>(); -+ List<Info> infoList = new ArrayList<Info>(); - - 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-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 @@ - } - } - -- private static final Set<Type> checking = new HashSet<>(); -+ private static final Set<Type> checking = new HashSet<Type>(); - - 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-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"); - WeakReference<MyClassLoader> ref = -- new WeakReference<>(appClassLoader); -+ new WeakReference<MyClassLoader>(appClassLoader); - - - 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-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 @@ - } - } - final int threadCount = 2; -- List<RandomCollector> collectors = new ArrayList<>(); -+ List<RandomCollector> collectors = new ArrayList<RandomCollector>(); - 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 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2011-07-12 16:56:06.818261891 +0100 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -5516,9 +5021,9 @@ } 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 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2011-07-12 16:56:06.818261891 +0100 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -5573,9 +5078,9 @@ } 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 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2011-07-12 16:56:06.818261891 +0100 @@ -81,7 +81,7 @@ } @@ -5602,9 +5107,9 @@ 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 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2011-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2011-07-12 16:56:06.818261891 +0100 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -5640,149 +5145,621 @@ 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; +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-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2011-07-12 16:56:06.810261758 +0100 +@@ -113,7 +113,7 @@ + + // Table of known loggers. Maps names to PlatformLoggers. + private static Map<String,WeakReference<PlatformLogger>> loggers = +- new HashMap<>(); ++ new HashMap<String,WeakReference<PlatformLogger>>(); + + /** + * Returns a PlatformLogger of a given name. +@@ -126,7 +126,7 @@ + } + if (log == null) { + log = new PlatformLogger(name); +- loggers.put(name, new WeakReference<>(log)); ++ loggers.put(name, new WeakReference<PlatformLogger>(log)); + } + return log; } - -@@ -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 @@ +@@ -469,7 +469,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 @@ + static class JavaLogger extends LoggerProxy { + private static final Map<Integer, Object> levelObjects = +- new HashMap<>(); ++ new HashMap<Integer, Object>(); + + 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-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2011-07-12 16:56:06.810261758 +0100 +@@ -151,7 +151,7 @@ + } + + Action action = Action.valueOf(args[0]); +- Map<String, Object> env = env = new HashMap<>(); ++ Map<String, Object> env = env = new HashMap<String,Object>(); + if (action == Action.create) + env.put("create", "true"); + try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) { +@@ -647,9 +647,9 @@ + + private static void fchCopy(Path src, Path dst) throws IOException + { +- Set<OpenOption> read = new HashSet<>(); ++ Set<OpenOption> read = new HashSet<OpenOption>(); + read.add(READ); +- Set<OpenOption> openwrite = new HashSet<>(); ++ Set<OpenOption> openwrite = new HashSet<OpenOption>(); + openwrite.add(CREATE_NEW); + openwrite.add(WRITE); + +@@ -667,9 +667,9 @@ + + private static void chCopy(Path src, Path dst) throws IOException + { +- Set<OpenOption> read = new HashSet<>(); ++ Set<OpenOption> read = new HashSet<OpenOption>(); + read.add(READ); +- Set<OpenOption> openwrite = new HashSet<>(); ++ Set<OpenOption> openwrite = new HashSet<OpenOption>(); + openwrite.add(CREATE_NEW); + openwrite.add(WRITE); + +diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2011-03-14 22:10:33.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2011-07-12 16:56:06.810261758 +0100 +@@ -133,8 +133,8 @@ + return new ZipCoder(Charset.defaultCharset()); + } + +- private final ThreadLocal<CharsetDecoder> decTL = new ThreadLocal<>(); +- private final ThreadLocal<CharsetEncoder> encTL = new ThreadLocal<>(); ++ private final ThreadLocal<CharsetDecoder> decTL = new ThreadLocal<CharsetDecoder>(); ++ private final ThreadLocal<CharsetEncoder> encTL = new ThreadLocal<CharsetEncoder>();r + + 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-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2011-07-12 16:56:06.810261758 +0100 +@@ -125,7 +125,7 @@ + throws IOException { - ois.defaultReadObject(); - if (! (groupTable instanceof ConcurrentHashMap)) { -- groupTable = new ConcurrentHashMap<>(groupTable); -+ groupTable = new ConcurrentHashMap<ActivationGroupID,GroupEntry>(groupTable); + ZipFileAttributes zfas = readAttributes(); +- LinkedHashMap<String, Object> map = new LinkedHashMap<>(); ++ LinkedHashMap<String, Object> map = new LinkedHashMap<String,Object>(); + if ("*".equals(attributes)) { + 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-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2011-07-12 16:56:06.810261758 +0100 +@@ -147,7 +147,7 @@ + + @Override + public Iterable<Path> getRootDirectories() { +- ArrayList<Path> pathArr = new ArrayList<>(); ++ ArrayList<Path> pathArr = new ArrayList<Path>(); + pathArr.add(new ZipPath(this, new byte[]{'/'})); + return pathArr; + } +@@ -192,7 +192,7 @@ + + @Override + public Iterable<FileStore> getFileStores() { +- ArrayList<FileStore> list = new ArrayList<>(1); ++ ArrayList<FileStore> list = new ArrayList<FileStore>(1); + list.add(new ZipFileStore(new ZipPath(this, new byte[]{'/'}))); + return list; + } +@@ -258,7 +258,7 @@ + endWrite(); + } + if (!streams.isEmpty()) { // unlock and close all remaining streams +- Set<InputStream> copy = new HashSet<>(streams); ++ Set<InputStream> copy = new HashSet<InputStream>(streams); + for (InputStream is: copy) + is.close(); + } +@@ -386,7 +386,7 @@ + IndexNode inode = getInode(path); + if (inode == null) + throw new NotDirectoryException(getString(path)); +- List<Path> list = new ArrayList<>(); ++ List<Path> list = new ArrayList<Path>(); + IndexNode child = inode.child; + while (child != null) { + ZipPath zp = toZipPath(child.name); +@@ -815,7 +815,7 @@ + + // the ex-channel and ex-path that need to close when their outstanding + // input streams are all closed by the obtainers. +- private Set<ExChannelCloser> exChClosers = new HashSet<>(); ++ private Set<ExChannelCloser> exChClosers = new HashSet<ExChannelCloser>(); + + private Set<Path> tmppaths = Collections.synchronizedSet(new HashSet<Path>()); + private Path getTempPathForEntry(byte[] path) throws IOException { +@@ -1012,7 +1012,7 @@ + private byte[] initCEN() throws IOException { + end = findEND(); + if (end.endpos == 0) { +- inodes = new LinkedHashMap<>(10); ++ inodes = new LinkedHashMap<IndexNode,IndexNode>(10); + locpos = 0; + buildNodeTree(); + return null; // only END header present +@@ -1033,7 +1033,7 @@ + zerror("read CEN tables failed"); } - if (! (idTable instanceof ConcurrentHashMap)) { -- idTable = new ConcurrentHashMap<>(idTable); -+ idTable = new ConcurrentHashMap<ActivationID,ActivationGroupID>(idTable); + // Iterate through the entries in the central directory +- inodes = new LinkedHashMap<>(end.centot + 1); ++ inodes = new LinkedHashMap<IndexNode,IndexNode>(end.centot + 1); + int pos = 0; + int limit = cen.length - ENDHDR; + while (pos < limit) { +@@ -1180,7 +1180,7 @@ + return; + Path tmpFile = createTempFileInSameDirectoryAs(zfpath); + OutputStream os = Files.newOutputStream(tmpFile, WRITE); +- ArrayList<Entry> elist = new ArrayList<>(inodes.size()); ++ ArrayList<Entry> elist = new ArrayList<Entry>(inodes.size()); + long written = 0; + byte[] buf = new byte[8192]; + Entry e = null; +@@ -1592,7 +1592,7 @@ + // Maxmum number of de/inflater we cache + private final int MAX_FLATER = 20; + // List of available Inflater objects for decompression +- private final List<Inflater> inflaters = new ArrayList<>(); ++ private final List<Inflater> inflaters = new ArrayList<Inflater>(); + + // Gets an inflater from the list of available inflaters or allocates + // a new one. +@@ -1621,7 +1621,7 @@ + } + + // List of available Deflater objects for compression +- private final List<Deflater> deflaters = new ArrayList<>(); ++ private final List<Deflater> deflaters = new ArrayList<Deflater>(); + + // Gets an deflater from the list of available deflaters or allocates + // a new one. +@@ -2331,7 +2331,7 @@ + private void buildNodeTree() throws IOException { + beginWrite(); + try { +- HashSet<IndexNode> dirs = new HashSet<>(); ++ HashSet<IndexNode> dirs = new HashSet<IndexNode>(); + IndexNode root = new IndexNode(ROOTPATH, -1); + 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-06-11 00:38:11.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2011-07-12 16:56:06.810261758 +0100 +@@ -53,7 +53,7 @@ + public class ZipFileSystemProvider extends FileSystemProvider { + + +- private final Map<Path, ZipFileSystem> filesystems = new HashMap<>(); ++ private final Map<Path, ZipFileSystem> filesystems = new HashMap<Path,ZipFileSystem>(); + + 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-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2011-07-12 16:56:06.814261825 +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. + byte[][] environ = environ(); +- theEnvironment = new HashMap<>(environ.length/2 + 3); ++ theEnvironment = new HashMap<Variable,Value>(environ.length/2 + 3); + // Read environment variables back to front, + // 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-07-12 15:23:26.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2011-07-12 16:56:06.814261825 +0100 +@@ -354,7 +354,7 @@ + * log against that map. The resulting map is then written back + * to the disk. + */ +- final List<Change> changeLog = new ArrayList<>(); ++ final List<Change> changeLog = new ArrayList<Change>(); + + /** + * Represents a change to a preference. +@@ -507,7 +507,7 @@ + }); + if (newNode) { + // These 2 things guarantee node will get wrtten at next flush/sync +- prefsCache = new TreeMap<>(); ++ prefsCache = new TreeMap<String, String>(); + nodeCreate = new NodeCreate(); + changeLog.add(nodeCreate); + } +@@ -550,7 +550,7 @@ + loadCache(); + } catch(Exception e) { + // assert lastSyncTime == 0; +- prefsCache = new TreeMap<>(); ++ prefsCache = new TreeMap<String, String>(); } } -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); +@@ -567,7 +567,7 @@ + AccessController.doPrivileged( + new PrivilegedExceptionAction<Void>() { + public Void run() throws BackingStoreException { +- Map<String, String> m = new TreeMap<>(); ++ Map<String, String> m = new TreeMap<String, String>(); + long newLastSyncTime = 0; + FileInputStream fis = null; + try { +@@ -581,7 +581,7 @@ + prefsFile.renameTo( new File( + prefsFile.getParentFile(), + "IncorrectFormatPrefs.xml")); +- m = new TreeMap<>(); ++ m = new TreeMap<String, String>(); + } else if (e instanceof FileNotFoundException) { + getLogger().warning("Prefs file removed in background " + + prefsFile.getPath()); +@@ -662,7 +662,7 @@ + return AccessController.doPrivileged( + new PrivilegedAction<String[]>() { + public String[] run() { +- List<String> result = new ArrayList<>(); ++ List<String> result = new ArrayList<String>(); + File[] dirContents = dir.listFiles(); + if (dirContents != null) { + for (int i = 0; i < dirContents.length; i++) +@@ -810,7 +810,7 @@ + } else if (lastSyncTime != 0 && !dir.exists()) { + // This node was removed in the background. Playback any changes + // against a virgin (empty) Map. +- prefsCache = new TreeMap<>(); ++ prefsCache = new TreeMap<String, String>(); + replayChanges(); + } + 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-07-12 16:56:06.814261825 +0100 +@@ -60,7 +60,7 @@ + int maxperkeyword, + int maxkeywords) + { +- LinkedList<String> ll = new LinkedList<>(); ++ LinkedList<String> ll = new LinkedList<String>(); + + try { + BufferedReader in = +@@ -200,7 +200,7 @@ + // no local domain so try fallback (RPC) domain or + // hostname + +- sl = new LinkedList<>(); ++ sl = new LinkedList<String>(); + String domain = fallbackDomain0(); + if (domain != null && domain.length() > 0) { + 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-07-12 16:56:06.814261825 +0100 +@@ -153,12 +153,12 @@ + + static { + HashMap<ControlSequence, String> tSequenceToEncodingMap = +- new HashMap<>(33, 1.0f); ++ new HashMap<ControlSequence, String>(33, 1.0f); + HashMap<ControlSequence, Boolean> tHighBitsMap = +- new HashMap<>(31, 1.0f); ++ new HashMap<ControlSequence, Boolean>(31, 1.0f); + HashMap<String, ControlSequence> tEncodingToSequenceMap = +- new HashMap<>(21, 1.0f); +- ArrayList<String> tEncodings = new ArrayList<>(21); ++ new HashMap<String, ControlSequence>(21, 1.0f); ++ ArrayList<String> tEncodings = new ArrayList<String>(21); + + 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-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2011-07-12 16:56:06.814261825 +0100 +@@ -53,7 +53,7 @@ + static final Set<String> supportedFileAttributeViews = + supportedFileAttributeViews(); + private static Set<String> supportedFileAttributeViews() { +- Set<String> result = new HashSet<>(); ++ Set<String> result = new HashSet<String>(); + result.addAll(standardFileAttributeViews()); + // additional Linux-specific views + result.add("dos"); +@@ -76,7 +76,7 @@ + * Returns object to iterate over the mount entries in the given fstab file. + */ + Iterable<UnixMountEntry> getMountEntries(String fstab) { +- ArrayList<UnixMountEntry> entries = new ArrayList<>(); ++ ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>(); + try { + 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-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2011-07-12 16:56:06.814261825 +0100 +@@ -63,7 +63,7 @@ + + // Parses buffer as array of NULL-terminated C strings. + private List<String> asList(long address, int size) { +- List<String> list = new ArrayList<>(); ++ List<String> list = new ArrayList<String>(); + int start = 0; + 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-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2011-07-12 16:56:06.814261825 +0100 +@@ -198,7 +198,7 @@ + * Decode the buffer, returning an ACL + */ + private static List<AclEntry> decode(long address, int n) { +- ArrayList<AclEntry> acl = new ArrayList<>(n); ++ ArrayList<AclEntry> acl = new ArrayList<AclEntry>(n); + for (int i=0; i<n; i++) { + 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-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2011-07-12 16:56:06.814261825 +0100 +@@ -76,7 +76,7 @@ + static final Set<String> supportedFileAttributeViews = + supportedFileAttributeViews(); + private static Set<String> supportedFileAttributeViews() { +- Set<String> result = new HashSet<>(); ++ Set<String> result = new HashSet<String>(); + result.addAll(standardFileAttributeViews()); + // additional Solaris-specific views + result.add("acl"); +@@ -101,7 +101,7 @@ + */ + @Override + Iterable<UnixMountEntry> getMountEntries() { +- ArrayList<UnixMountEntry> entries = new ArrayList<>(); ++ ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>(); + try { + 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-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2011-07-12 16:56:06.814261825 +0100 +@@ -83,7 +83,7 @@ + } + + // read list of extended attributes +- List<String> list = new ArrayList<>(); ++ List<String> list = new ArrayList<String>(); + try { + 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-06-11 00:38:13.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2011-07-12 16:56:06.814261825 +0100 +@@ -194,7 +194,7 @@ + @Override + public Set<PosixFilePermission> permissions() { + int bits = (st_mode & UnixConstants.S_IAMB); +- HashSet<PosixFilePermission> perms = new HashSet<>(); ++ HashSet<PosixFilePermission> perms = new HashSet<PosixFilePermission>(); + + 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-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2011-07-12 16:56:06.814261825 +0100 +@@ -250,7 +250,8 @@ + envblock.substring(eql+1,end)); + } + +- theCaseInsensitiveEnvironment = new TreeMap<>(nameComparator); ++ theCaseInsensitiveEnvironment ++ = new TreeMap<String,String>(nameComparator); + theCaseInsensitiveEnvironment.putAll(theEnvironment); + } + +@@ -295,7 +296,8 @@ + // Only for use by ProcessImpl.start() + String toEnvironmentBlock() { + // Sort Unicode-case-insensitively by name +- List<Map.Entry<String,String>> list = new ArrayList<>(entrySet()); ++ List<Map.Entry<String,String>> list ++ = new ArrayList<Map.Entry<String,String>>(entrySet()); + Collections.sort(list, entryComparator); + + 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-07-12 16:56:06.814261825 +0100 +@@ -63,7 +63,7 @@ + // Parse string that consists of token delimited by space or commas + // and return LinkedHashMap + private LinkedList<String> stringToList(String str) { +- LinkedList<String> ll = new LinkedList<>(); ++ LinkedList<String> ll = new LinkedList<String>(); + + // 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-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2011-07-12 16:56:06.814261825 +0100 +@@ -128,7 +128,7 @@ + } + + // iterate over roots, ignoring those that the security manager denies +- ArrayList<Path> result = new ArrayList<>(); ++ ArrayList<Path> result = new ArrayList<Path>(); + SecurityManager sm = System.getSecurityManager(); + 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-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2011-07-12 16:56:06.814261825 +0100 +@@ -575,7 +575,7 @@ + // generate offset array + private void initOffsets() { + if (offsets == null) { +- ArrayList<Integer> list = new ArrayList<>(); ++ ArrayList<Integer> list = new ArrayList<Integer>(); + if (isEmpty()) { + // 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-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2011-07-12 16:56:06.814261825 +0100 +@@ -378,7 +378,7 @@ + AclInformation aclInfo = GetAclInformation(aclAddress); + aceCount = aclInfo.aceCount(); + } +- ArrayList<AclEntry> result = new ArrayList<>(aceCount); ++ ArrayList<AclEntry> result = new ArrayList<AclEntry>(aceCount); + + // 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-06-11 00:38:15.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2011-07-12 16:56:06.814261825 +0100 +@@ -65,7 +65,7 @@ + + // enumerates the file streams using FindFirstStream/FindNextStream APIs. + private List<String> listUsingStreamEnumeration() throws IOException { +- List<String> list = new ArrayList<>(); ++ List<String> list = new ArrayList<String>(); + try { + FirstStream first = FindFirstStream(file.getPathForWin32Calls()); + if (first != null) { +@@ -114,7 +114,7 @@ + NativeBuffer buffer = null; + + // result with names of alternative data streams +- final List<String> list = new ArrayList<>(); ++ final List<String> list = new ArrayList<String>(); + + try { + buffer = NativeBuffers.getNativeBuffer(BUFFER_SIZE); +@@ -216,7 +216,7 @@ + // wrap with channel + FileChannel fc = null; + try { +- Set<OpenOption> opts = new HashSet<>(); ++ Set<OpenOption> opts = new HashSet<OpenOption>(); + opts.add(READ); + if (!followLinks) + opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); +@@ -243,7 +243,7 @@ + // wrap with channel + FileChannel fc = null; + try { +- Set<OpenOption> opts = new HashSet<>(); ++ Set<OpenOption> opts = new HashSet<OpenOption>(); + opts.add(READ); + if (!followLinks) + opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); +@@ -298,7 +298,7 @@ + x.rethrowAsIOException(file); + } + try { +- Set<OpenOption> opts = new HashSet<>(); ++ Set<OpenOption> opts = new HashSet<OpenOption>(); + if (!followLinks) + 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-06-11 00:38:16.000000000 +0100 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2011-07-12 16:56:06.814261825 +0100 +@@ -56,7 +56,7 @@ + public static void main(String[] args) { + System.err.println("\n Regression test for bug 6541870\n"); + try { +- ArrayList<NPEProvoker> list = new ArrayList<>(); ++ ArrayList<NPEProvoker> list = new ArrayList<NPEProvoker>(); + list.add(new NPEProvoker()); + 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-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2011-07-12 16:56:06.814261825 +0100 +@@ -50,7 +50,7 @@ + private final Injector[] after = new Injector[256]; + private final String className; + private final String methodName; +- private final Map<Integer,byte[]> snippets = new HashMap<>(); ++ private final Map<Integer,byte[]> snippets = new HashMap<Integer,byte[]>(); + + 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-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2011-07-12 16:56:06.814261825 +0100 +@@ -107,7 +107,7 @@ + class IndexedInjector implements TrackerInjector { + int counter = 0; + int tracker; +- List<Info> infoList = new ArrayList<>(); ++ List<Info> infoList = new ArrayList<Info>(); + + 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-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2011-07-12 16:56:06.814261825 +0100 +@@ -103,7 +103,7 @@ + } + } + +- private static final Set<Type> checking = new HashSet<>(); ++ private static final Set<Type> checking = new HashSet<Type>(); + + 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-06-11 00:38:18.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2011-07-12 16:56:06.814261825 +0100 +@@ -89,7 +89,7 @@ + + MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); + WeakReference<MyClassLoader> ref = +- new WeakReference<>(appClassLoader); ++ new WeakReference<MyClassLoader>(appClassLoader); + + + 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-06-11 00:38:17.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2011-07-12 16:56:06.818261891 +0100 +@@ -59,7 +59,7 @@ + } + } + final int threadCount = 2; +- List<RandomCollector> collectors = new ArrayList<>(); ++ List<RandomCollector> collectors = new ArrayList<RandomCollector>(); + List<Thread> threads = new ArrayList<Thread>(); + for (int i = 0; i < threadCount; i++) { + RandomCollector r = new RandomCollector(); +diff -r 483d8dacfbd8 src/share/classes/sun/net/www/URLConnection.java +--- openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java Mon Jul 11 22:06:00 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java Tue Jul 12 17:25:03 2011 +0100 +@@ -239,7 +239,7 @@ + url = null; + } + +- private static HashMap<String,Void> proxiedHosts = new HashMap<>(); ++ private static HashMap<String,Void> proxiedHosts = new HashMap<String,Void>(); + + public synchronized static void setProxiedHost(String host) { + proxiedHosts.put(host.toLowerCase(), null);
--- a/patches/boot/ecj-stringswitch.patch Tue Jul 12 11:32:03 2011 +0100 +++ b/patches/boot/ecj-stringswitch.patch Wed Jul 13 22:13:02 2011 +0100 @@ -1,6 +1,6 @@ -diff -r 1631a3dee8fc 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 Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java Sat Apr 30 03:28:15 2011 +0100 +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-30 03:28:27.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-12 13:58:37.260113734 +0100 @@ -350,18 +350,15 @@ if (attrCommands != null) { Object lkey = Attribute.keyForLookup(ctype, name); @@ -29,9 +29,9 @@ } } // Find canonical instance of the requested attribute. -diff -r 1631a3dee8fc 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 Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java Sat Apr 30 03:28:15 2011 +0100 +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-06-11 00:38:08.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-12 13:58:37.264113794 +0100 @@ -71,16 +71,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. @@ -88,9 +88,9 @@ } if (logFile != null && !logFile.equals("")) { -diff -r 1631a3dee8fc 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 Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java Sat Apr 30 03:28:15 2011 +0100 +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-30 03:28:27.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-12 13:58:37.264113794 +0100 @@ -1116,30 +1116,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) @@ -141,9 +141,9 @@ } } -diff -r 1631a3dee8fc src/share/classes/com/sun/security/ntlm/NTLM.java ---- openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java Sat Apr 30 03:28:15 2011 +0100 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2011-04-30 03:28:32.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2011-07-12 13:58:37.264113794 +0100 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -179,53 +179,9 @@ try { fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); -diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/MethodHandles.java ---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Sat Apr 30 03:28:15 2011 +0100 -@@ -2293,32 +2293,30 @@ - - private static - boolean isObjectMethod(Method m) { -- switch (m.getName()) { -- case "toString": -+ final String name = m.getName(); -+ if ("toString".equals(name)) - return (m.getReturnType() == String.class - && m.getParameterTypes().length == 0); -- case "hashCode": -+ if ("hashCode".equals(name)) - return (m.getReturnType() == int.class - && m.getParameterTypes().length == 0); -- case "equals": -+ if ("equals".equals(name)) - return (m.getReturnType() == boolean.class - && m.getParameterTypes().length == 1 - && m.getParameterTypes()[0] == Object.class); -- } - return false; - } - - private static - Object callObjectMethod(Object self, Method m, Object[] args) { - assert(isObjectMethod(m)) : m; -- switch (m.getName()) { -- case "toString": -+ final String name = m.getName(); -+ if ("toString".equals(name)) - return self.getClass().getName() + "@" + Integer.toHexString(self.hashCode()); -- case "hashCode": -+ if ("hashCode".equals(name)) - return System.identityHashCode(self); -- case "equals": -+ if ("equals".equals(name)) - return (self == args[0]); -- } - return null; - } - -diff -r 1631a3dee8fc src/share/classes/sun/launcher/LauncherHelper.java ---- openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java Sat Apr 30 03:28:15 2011 +0100 +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-06-11 00:38:09.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-07-12 13:58:37.268113854 +0100 @@ -117,24 +117,20 @@ String optStr = (opts.length > 1 && opts[1] != null) ? opts[1].trim() @@ -245,26 +201,26 @@ - stackSize, isServer); - break; - case "properties": -- printProperties(ostream); ++ stackSize, isServer); + printProperties(ostream); - break; - case "locale": -- printLocale(ostream); + printLocale(ostream); - break; - default: - printVmSettings(ostream, initialHeapSize, maxHeapSize, - stackSize, isServer); -+ stackSize, isServer); - printProperties(ostream); - printLocale(ostream); +- printProperties(ostream); +- printLocale(ostream); - break; - } + } } /* -diff -r 1631a3dee8fc src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java ---- openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java Wed Apr 20 04:38:36 2011 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java Sat Apr 30 03:28:15 2011 +0100 +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2011-04-30 03:28:32.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2011-07-12 13:58:37.268113854 +0100 @@ -383,19 +383,23 @@ GE; // ">=" @@ -302,3 +258,46 @@ } throw new IllegalArgumentException( +diff -r 483d8dacfbd8 src/share/classes/java/lang/invoke/MethodHandleProxies.java +--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java Mon Jul 11 22:06:00 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java Tue Jul 12 19:06:31 2011 +0100 +@@ -211,14 +211,16 @@ + + private static + boolean isObjectMethod(Method m) { +- switch (m.getName()) { +- case "toString": ++ String name = m.getName(); ++ if ("toString".equals(name)) { + return (m.getReturnType() == String.class + && m.getParameterTypes().length == 0); +- case "hashCode": ++ } ++ if ("hashCode".equals(name)) { + return (m.getReturnType() == int.class + && m.getParameterTypes().length == 0); +- case "equals": ++ } ++ if ("equals".equals(name)) { + return (m.getReturnType() == boolean.class + && m.getParameterTypes().length == 1 + && m.getParameterTypes()[0] == Object.class); +@@ -229,12 +231,14 @@ + private static + Object callObjectMethod(Object self, Method m, Object[] args) { + assert(isObjectMethod(m)) : m; +- switch (m.getName()) { +- case "toString": ++ String name = m.getName(); ++ if ("toString".equals(name)) { + return self.getClass().getName() + "@" + Integer.toHexString(self.hashCode()); +- case "hashCode": ++ } ++ if ("hashCode".equals(name)) { + return System.identityHashCode(self); +- case "equals": ++ } ++ if ("equals".equals(name)) { + return (self == args[0]); + } + return null;