# HG changeset patch # User Andrew John Hughes # Date 1390923479 0 # Node ID ceec45b60d011c919a75972518fb69c10fd2d52a # Parent 6737b461b59a33b7a45a4b120900338f60138d5f Bring in non-security changes from u51b31, plus PR1653 & PR1654. 2014-01-28 Andrew John Hughes * Makefile.am: (BUILD_VERSION): Set to b31. (CORBA_CHANGESET): Update to IcedTea 2.4 HEAD. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * hotspot.map: Update to IcedTea 2.4 HEAD. * patches/boot/ecj-diamond.patch: Regenerated. diff -r 6737b461b59a -r ceec45b60d01 ChangeLog --- a/ChangeLog Wed Jan 22 10:46:56 2014 +0000 +++ b/ChangeLog Tue Jan 28 15:37:59 2014 +0000 @@ -1,3 +1,23 @@ +2014-01-28 Andrew John Hughes + + * Makefile.am: + (BUILD_VERSION): Set to b31. + (CORBA_CHANGESET): Update to IcedTea 2.4 HEAD. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * hotspot.map: Update to IcedTea 2.4 HEAD. + * patches/boot/ecj-diamond.patch: Regenerated. + 2014-01-22 Andrew John Hughes * NEWS: Remove bug IDs not in repository. diff -r 6737b461b59a -r ceec45b60d01 Makefile.am --- a/Makefile.am Wed Jan 22 10:46:56 2014 +0000 +++ b/Makefile.am Tue Jan 28 15:37:59 2014 +0000 @@ -1,22 +1,22 @@ # Dependencies JDK_UPDATE_VERSION = 51 -BUILD_VERSION = b00 +BUILD_VERSION = b31 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = e540fd592221 -JAXP_CHANGESET = 2e2bf2d8be16 -JAXWS_CHANGESET = 5aceb5a787b1 -JDK_CHANGESET = 1fe539ed00bc -LANGTOOLS_CHANGESET = 3f5408abf14b -OPENJDK_CHANGESET = 796d1bf47b24 +CORBA_CHANGESET = 3594dbde270d +JAXP_CHANGESET = 8fe156ad49e2 +JAXWS_CHANGESET = 32ea8b1ed91a +JDK_CHANGESET = a74c2e4a756b +LANGTOOLS_CHANGESET = dabd37b7e295 +OPENJDK_CHANGESET = 410eb7fef869 -CORBA_SHA256SUM = 77c3285f6abdefe7f19fc4c698ef1f4fe533f38941314e7e7077c34fa5eb4456 -JAXP_SHA256SUM = 48bb8ece00ef62c6c0161dd90e5789419594dfb5d08163781dac9ffc00c0a3f8 -JAXWS_SHA256SUM = ee2a7165b78693c3bb61a90128b60934704e9a5c6c7514abfbb61e41531b9919 -JDK_SHA256SUM = 16373b85dc5123cfe1816ec04f7d14e9a048c6eee7eb7c22b5b816fa1fd5e9bc -LANGTOOLS_SHA256SUM = 4375ccfacc49793dd0f13cb73ce3c684218bce71008fc237f3b6da754f4dfea6 -OPENJDK_SHA256SUM = abe048022f46f4d04130b2cf6a1b1d897bdca981518349d34fe5b415310f7782 +CORBA_SHA256SUM = d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d +JAXP_SHA256SUM = 0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3 +JAXWS_SHA256SUM = 08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0 +JDK_SHA256SUM = 1755a0c0439c7b8e0552ece4e24686ecfd64ef886dea0622e0b9f224103674ae +LANGTOOLS_SHA256SUM = 86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f +OPENJDK_SHA256SUM = 2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707 CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab diff -r 6737b461b59a -r ceec45b60d01 NEWS --- a/NEWS Wed Jan 22 10:46:56 2014 +0000 +++ b/NEWS Tue Jan 28 15:37:59 2014 +0000 @@ -14,6 +14,40 @@ New in release 2.4.5 (2014-01-XX): +* Backports + - S8015976: OpenJDK part of bug JDK-8015812 [TEST_BUG] Tests have conflicting test descriptions + - S8022698: javax/script/GetInterfaceTest.java fails since 7u45 b04 with -agentvm option + - S8022868: missing codepage Cp290 at java runtime + - S8023310: Thread contention in the method Beans.IsDesignTime() + - S8024461: [macosx] Java crashed on mac10.9 for swing and 2d function manual test + - S8025679: Increment minor version of HSx for 7u51 and initialize the build number + - S8026037: [TESTBUG] sun/security/tools/jarsigner/warnings.sh test fails on Solaris + - S8026304: jarsigner output bad grammar + - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing + - S8026887: Make issues due to failed large pages allocations easier to debug + - S8027204: Revise the update of 8026204 and 8025758 + - S8027224: test regression - ClassNotFoundException + - S8027370: Support tzdata2013h + - S8027378: Two closed/javax/xml/8005432 fails with jdk7u51b04 + - S8027787: 7u51 l10n resource file translation update 1 + - S8027837: JDK-8021257 causes CORBA build failure on emdedded platforms + - S8027943: serial version of com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl changed in 7u45 + - S8027944: Increment hsx 24.51 build to b02 for 7u51-b07 + - S8028057: Modify jarsigner man page documentation to document CCC 8024302: Clarify jar verifications + - S8028090: reverting change - changeset pushed with incorrect commit message, linked to wrong issue + - S8028111: XML readers share the same entity expansion counter + - S8028215: ORB.init fails with SecurityException if properties select the JDK default ORB + - S8028293: Check local configuration for actual ephemeral port range + - S8028382: Two javax/xml/8005433 tests still fail after the fix JDK-8028147 + - S8028453: AsynchronousSocketChannel.connect() requires SocketPermission due to bind to local address (win) + - S8028823: java/net/Makefile tabs converted to spaces + - S8029038: Revise fix for XML readers share the same entity expansion counter + - S8029842: Increment hsx 24.51 build to b03 for 7u51-b11 +* Bug fixes + - Fix broken bootstrap build by updating ecj-multicatch.patch + - PR1653: Support ppc64le via Zero + - PR1654: ppc32 needs a larger ThreadStackSize to build + New in release 2.4.4 (2014-01-14): * Security fixes diff -r 6737b461b59a -r ceec45b60d01 hotspot.map --- a/hotspot.map Wed Jan 22 10:46:56 2014 +0000 +++ b/hotspot.map Tue Jan 28 15:37:59 2014 +0000 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot a8a33cc2dd4b cb5f109ae32c07301bc3a017c334ca3a7723124ff217d46127a16ade516d2902 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot cbeecad5efcb 511d0337cf8ab6cfbd9b7d9a5a2dd2a19bad01eb11b33e947154b95ddb46ab0e diff -r 6737b461b59a -r ceec45b60d01 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Wed Jan 22 10:46:56 2014 +0000 +++ b/patches/boot/ecj-diamond.patch Tue Jan 28 15:37:59 2014 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-24 21:31:42.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-30 18:32:50.125579213 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-01-23 23:19:18.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-01-28 11:39:19.697588883 +0000 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-24 21:31:42.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-30 18:32:50.141579926 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-01-23 23:19:18.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-01-28 11:39:19.697588883 +0000 @@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set oaset; @@ -23,8 +23,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-24 21:31:42.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-30 18:32:50.145580045 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-01-23 23:19:18.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-01-28 11:39:19.697588883 +0000 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -44,8 +44,8 @@ for (WorkerThread wt : copy) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:55.970380942 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:29.097954416 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-01-28 11:38:19.384649230 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-01-28 11:39:19.697588883 +0000 @@ -297,8 +297,8 @@ // private final static class EncodingInfos { @@ -66,26 +66,9 @@ while (keys.hasMoreElements()) { final String javaName = (String) keys.nextElement(); final String[] mimes = parseMimeTypes(props.getProperty(javaName)); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-30 18:32:50.149580081 +0100 -@@ -62,9 +62,10 @@ - */ - public final class DocumentHandler extends DefaultHandler { - private final AccessControlContext acc = AccessController.getContext(); -- private final Map> handlers = new HashMap<>(); -- private final Map environment = new HashMap<>(); -- private final List objects = new ArrayList<>(); -+ private final Map> handlers = -+ new HashMap>(); -+ private final Map environment = new HashMap(); -+ private final List objects = new ArrayList(); - - private Reference loader; - private ExceptionListener listener; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-30 18:32:50.149580081 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-01-28 11:39:19.697588883 +0000 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -104,9 +87,26 @@ prepare(map, actual); CACHE.put(actual, map); } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-01-28 11:39:19.697588883 +0000 +@@ -63,9 +63,10 @@ + */ + public final class DocumentHandler extends DefaultHandler { + private final AccessControlContext acc = AccessController.getContext(); +- private final Map> handlers = new HashMap<>(); +- private final Map environment = new HashMap<>(); +- private final List objects = new ArrayList<>(); ++ private final Map> handlers = ++ new HashMap>(); ++ private final Map environment = new HashMap(); ++ private final List objects = new ArrayList(); + + private Reference loader; + private ExceptionListener listener; 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-07-30 18:32:50.153580096 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-01-28 11:39:19.697588883 +0000 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -178,8 +178,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 2013-07-30 18:18:54.056413584 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-07-30 18:32:50.157580124 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-01-28 11:38:19.400649478 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-01-28 11:39:19.697588883 +0000 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -242,8 +242,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 2013-07-30 18:18:53.968412200 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-30 18:32:50.161580154 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-01-28 11:38:19.296647860 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-01-28 11:39:19.697588883 +0000 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -253,9 +253,21 @@ for (int i = 0; i < nc; i++) { InnerClass ic = new InnerClass(readClassRef(), +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-01-28 11:39:19.701588945 +0000 +@@ -402,7 +402,7 @@ + private static Map codeMap; + + private static synchronized Coding of(int B, int H, int S, int del) { +- if (codeMap == null) codeMap = new HashMap<>(); ++ if (codeMap == null) codeMap = new HashMap(); + Coding x0 = new Coding(B, H, S, del); + Coding x1 = codeMap.get(x0); + if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-07-30 18:32:50.161580154 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-01-28 11:39:19.701588945 +0000 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -291,21 +303,9 @@ for (int i = start; i < end; i++) { if (popset.add(values[i])) popvals.add(values[i]); } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-30 18:32:50.165580223 +0100 -@@ -402,7 +402,7 @@ - private static Map codeMap; - - private static synchronized Coding of(int B, int H, int S, int del) { -- if (codeMap == null) codeMap = new HashMap<>(); -+ if (codeMap == null) codeMap = new HashMap(); - Coding x0 = new Coding(B, H, S, del); - Coding x1 = codeMap.get(x0); - if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-30 18:32:50.169580312 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-01-28 11:39:19.701588945 +0000 @@ -919,7 +919,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -334,8 +334,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 2013-07-30 18:18:54.056413584 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-30 18:32:50.173580385 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-01-28 11:38:19.400649478 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-01-28 11:39:19.701588945 +0000 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -373,8 +373,8 @@ for (String optline : options.split("\n")) { String[] words = optline.split("\\p{Space}+"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-30 18:32:50.173580385 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-01-28 11:39:19.701588945 +0000 @@ -45,7 +45,7 @@ private final ArrayList flist; @@ -385,8 +385,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 2013-07-30 18:18:53.972412262 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-30 18:32:50.177580449 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-01-28 11:38:19.300647921 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-01-28 11:39:19.701588945 +0000 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map attrDefs; @@ -542,8 +542,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 2013-07-30 18:18:54.060413647 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-07-30 18:32:50.181580507 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-01-28 11:38:19.400649478 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-01-28 11:39:19.701588945 +0000 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -657,8 +657,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 2013-07-30 18:18:54.060413647 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-07-30 18:32:50.185580566 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-01-28 11:38:19.400649478 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-01-28 11:39:19.701588945 +0000 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -714,8 +714,8 @@ for (Class cls : pkg.classes) { if (!cls.hasInnerClasses()) continue; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-30 18:32:50.185580566 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-01-28 11:39:19.701588945 +0000 @@ -183,8 +183,8 @@ final Map attrDefs; final Map attrCommands; @@ -746,8 +746,8 @@ for (JarEntry je : Collections.list(jf.entries())) { InFile inFile = new InFile(jf, je); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-30 18:32:50.189580623 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-01-28 11:39:19.701588945 +0000 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -758,8 +758,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 2013-07-30 18:18:54.060413647 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-07-30 18:32:50.193580683 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-01-28 11:38:19.400649478 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-01-28 11:39:19.701588945 +0000 @@ -48,8 +48,8 @@ */ @@ -790,8 +790,8 @@ while (res.remove(null)); return res; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-30 18:32:50.193580683 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-01-28 11:39:19.701588945 +0000 @@ -58,12 +58,12 @@ private final Map memberEntries; @@ -812,8 +812,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 2013-07-30 18:18:54.060413647 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-07-30 18:32:50.197580747 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-01-28 11:38:19.404649541 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-01-28 11:39:19.701588945 +0000 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -824,8 +824,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 2013-07-30 18:18:54.060413647 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-07-30 18:32:50.201580815 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-01-28 11:38:19.404649541 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-01-28 11:39:19.701588945 +0000 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -836,8 +836,8 @@ // convenience methods to access the TL globals static TLGlobals getTLGlobals() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-30 18:32:50.625587499 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-01-28 11:39:19.701588945 +0000 @@ -54,7 +54,7 @@ * Contains event dispatcher per thread group. */ @@ -848,8 +848,8 @@ /** * Constructs a new AbstractLine. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-30 18:32:50.625587499 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-01-28 11:39:19.701588945 +0000 @@ -59,7 +59,7 @@ * dispatcher instance with a factory in EventDispatcher */ @@ -860,8 +860,8 @@ /** * All RealTimeSequencers share this info object. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-30 18:32:50.201580815 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-01-28 11:39:19.701588945 +0000 @@ -231,7 +231,7 @@ * Create an empty ExecOptionPermissionCollection. */ @@ -872,8 +872,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-30 18:32:50.205580881 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-01-28 11:39:19.701588945 +0000 @@ -235,7 +235,7 @@ * Create an empty ExecPermissionCollection. */ @@ -884,8 +884,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-30 18:32:50.209580944 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-01-28 11:39:19.705589008 +0000 @@ -1284,7 +1284,7 @@ */ public Collection toCollection() throws SQLException { @@ -905,8 +905,8 @@ // create a copy CachedRowSetImpl crsTemp; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-30 18:32:50.213581007 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-01-28 11:39:19.705589008 +0000 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -916,9 +916,21 @@ for(int i=0;i userCertList = new ArrayList<>(); ++ ArrayList userCertList = new ArrayList(); + i = 0; + while (i < certs.length) { + userCertList.add(certs[i]); 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-07-30 18:32:50.213581007 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2014-01-28 11:39:19.705589008 +0000 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -933,8 +945,8 @@ ConfirmationInfo confirmation = new ConfirmationInfo(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-07-30 18:32:50.217581069 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2014-01-28 11:39:19.705589008 +0000 @@ -152,7 +152,7 @@ // new configuration @@ -963,8 +975,8 @@ String value; while (peek(";") == false) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-07-30 18:32:50.221581130 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2014-01-28 11:39:19.705589008 +0000 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -975,8 +987,8 @@ // initial state private Subject subject; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-07-30 18:32:50.221581130 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2014-01-28 11:39:19.705589008 +0000 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -987,8 +999,8 @@ certList.add(fromKeyStore[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-07-30 18:32:50.225581191 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2014-01-28 11:39:19.705589008 +0000 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -999,8 +1011,8 @@ /** * Initialize this LoginModule. 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-07-30 18:32:50.225581191 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2014-01-28 11:39:19.705589008 +0000 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -1010,21 +1022,9 @@ /** * Initialize this LoginModule. -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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-07-30 18:32:50.229581254 +0100 -@@ -1180,7 +1180,7 @@ - // Done - return certs; - -- ArrayList userCertList = new ArrayList<>(); -+ ArrayList userCertList = new ArrayList(); - i = 0; - while (i < certs.length) { - userCertList.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-07-30 18:32:50.233581319 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2014-01-28 11:39:19.705589008 +0000 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -1035,8 +1035,8 @@ EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { super("event-handler"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2013-07-30 18:32:50.233581319 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2014-01-28 11:39:19.705589008 +0000 @@ -97,7 +97,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -1065,18 +1065,9 @@ } return targetBeanInfo; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-07-30 18:32:50.241581447 +0100 -@@ -41,7 +41,7 @@ - */ - final class ThreadGroupContext { - -- private static final WeakIdentityMap contexts = new WeakIdentityMap<>(); -+ private static final WeakIdentityMap contexts = new WeakIdentityMap(); - - /** - * Returns the appropriate {@code AppContext} for the caller, -@@ -100,7 +100,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-01-28 11:39:19.705589008 +0000 +@@ -96,7 +96,7 @@ BeanInfo putBeanInfo(Class type, BeanInfo info) { if (this.beanInfoCache == null) { @@ -1086,8 +1077,8 @@ return this.beanInfoCache.put(type, info); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-07-30 18:32:50.241581447 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2014-01-28 11:39:19.705589008 +0000 @@ -34,7 +34,7 @@ */ @@ -1106,21 +1097,9 @@ // reverse the list to maintain previous jdk deletion order. // Last in first deleted. -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2013-07-30 18:32:50.245581510 +0100 -@@ -61,7 +61,7 @@ - private volatile boolean closed = false; - - private static final ThreadLocal runningFinalize = -- new ThreadLocal<>(); -+ new ThreadLocal(); - - private static boolean isRunningFinalize() { - Boolean val; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/File.java openjdk-boot/jdk/src/share/classes/java/io/File.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2013-07-30 18:32:50.253581632 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2014-01-28 11:39:19.709589070 +0000 @@ -1150,7 +1150,7 @@ if ((names == null) || (filter == null)) { return names; @@ -1148,9 +1127,21 @@ for (String s : ss) { File f = new File(s, this); if ((filter == null) || filter.accept(f)) +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2014-01-28 11:39:19.705589008 +0000 +@@ -61,7 +61,7 @@ + private volatile boolean closed = false; + + private static final ThreadLocal runningFinalize = +- new ThreadLocal<>(); ++ new ThreadLocal(); + + private static boolean isRunningFinalize() { + Boolean val; 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2013-07-30 18:32:50.253581632 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2014-01-28 11:39:19.709589070 +0000 @@ -76,7 +76,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -1161,8 +1152,8 @@ private static boolean isRunningFinalize() { Boolean val; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2013-07-30 18:32:50.257581696 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2014-01-28 11:39:19.709589070 +0000 @@ -725,7 +725,7 @@ */ @@ -1191,8 +1182,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-07-30 18:32:50.261581761 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2014-01-28 11:39:19.709589070 +0000 @@ -214,7 +214,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -1217,8 +1208,8 @@ /** filter stream for handling block data conversion */ diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-07-30 18:32:50.265581825 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-01-28 11:39:19.709589070 +0000 @@ -166,11 +166,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1233,7 +1224,7 @@ } /** filter stream for handling block data conversion */ -@@ -2426,7 +2426,7 @@ +@@ -2432,7 +2432,7 @@ private final List stack; DebugTraceInfoStack() { @@ -1243,8 +1234,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-07-30 18:32:50.621587436 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2014-01-28 11:39:19.709589070 +0000 @@ -87,18 +87,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1334,8 +1325,8 @@ if (ref != null) { Caches.reflectors.remove(key, ref); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2013-07-30 18:32:50.277582013 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2014-01-28 11:39:19.709589070 +0000 @@ -47,7 +47,7 @@ } } @@ -1346,8 +1337,8 @@ // application shutdown hooks cannot be added if // shutdown is in progress. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java openjdk-boot/jdk/src/share/classes/java/lang/Character.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2013-07-30 18:32:50.281582075 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2014-01-28 11:39:19.709589070 +0000 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1368,8 +1359,8 @@ aliases.put("ARMI", IMPERIAL_ARAMAIC); aliases.put("ARMN", ARMENIAN); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2013-07-30 18:32:50.281582075 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2014-01-28 11:39:19.709589070 +0000 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1380,9 +1371,9 @@ throw new InternalError(x.getMessage()); } finally { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java openjdk-boot/jdk/src/share/classes/java/lang/Class.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2013-07-30 18:32:50.293582265 +0100 -@@ -1336,7 +1336,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2014-01-28 11:39:19.709589070 +0000 +@@ -1346,7 +1346,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction[]>() { public Class[] run() { @@ -1391,7 +1382,7 @@ Class currentClass = Class.this; while (currentClass != null) { Class[] members = currentClass.getDeclaredClasses(); -@@ -2387,9 +2387,9 @@ +@@ -2397,9 +2397,9 @@ res = Reflection.filterFields(this, getDeclaredFields0(publicOnly)); if (useCaches) { if (publicOnly) { @@ -1403,7 +1394,7 @@ } } return res; -@@ -2411,9 +2411,9 @@ +@@ -2421,9 +2421,9 @@ // No cached value available; compute value recursively. // Traverse in correct order for getField(). @@ -1415,7 +1406,7 @@ } // Local fields -@@ -2439,7 +2439,7 @@ +@@ -2449,7 +2449,7 @@ res = new Field[fields.size()]; fields.toArray(res); if (useCaches) { @@ -1424,7 +1415,7 @@ } return res; } -@@ -2484,9 +2484,9 @@ +@@ -2494,9 +2494,9 @@ } if (useCaches) { if (publicOnly) { @@ -1436,7 +1427,7 @@ } } return res; -@@ -2521,9 +2521,9 @@ +@@ -2531,9 +2531,9 @@ res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly)); if (useCaches) { if (publicOnly) { @@ -1448,7 +1439,7 @@ } } return res; -@@ -2679,7 +2679,7 @@ +@@ -2689,7 +2689,7 @@ methods.compactAndTrim(); res = methods.getArray(); if (useCaches) { @@ -1457,7 +1448,7 @@ } return res; } -@@ -3058,7 +3058,7 @@ +@@ -3068,7 +3068,7 @@ if (universe == null) throw new IllegalArgumentException( getName() + " is not an enum type"); @@ -1466,7 +1457,7 @@ for (T constant : universe) m.put(((Enum)constant).name(), constant); enumConstantDirectory = m; -@@ -3171,7 +3171,7 @@ +@@ -3181,7 +3181,7 @@ if (superClass == null) { annotations = declaredAnnotations; } else { @@ -1476,9 +1467,9 @@ for (Map.Entry, Annotation> e : superClass.annotations.entrySet()) { Class 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2013-07-30 18:32:50.301582391 +0100 -@@ -247,7 +247,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2014-01-28 11:39:19.713589132 +0000 +@@ -248,7 +248,7 @@ // The classes loaded by this class loader. The only purpose of this table // is to keep the classes from being GC'ed until the loader is GC'ed. @@ -1487,7 +1478,7 @@ // The "default" domain. Set as the default ProtectionDomain on newly // created classes. -@@ -266,7 +266,8 @@ +@@ -267,7 +267,8 @@ // The packages defined in this class loader. Each package name is mapped // to its corresponding Package object. // @GuardedBy("itself") @@ -1497,7 +1488,7 @@ private static Void checkCreateClassLoader() { SecurityManager security = System.getSecurityManager(); -@@ -279,16 +280,16 @@ +@@ -280,16 +281,16 @@ private ClassLoader(Void unused, ClassLoader parent) { this.parent = parent; if (ParallelLoaders.isRegistered(this.getClass())) { @@ -1518,7 +1509,7 @@ assertionLock = this; } } -@@ -1176,7 +1177,7 @@ +@@ -1184,7 +1185,7 @@ } tmp[1] = findResources(name); @@ -1527,7 +1518,7 @@ } /** -@@ -1675,7 +1676,7 @@ +@@ -1683,7 +1684,7 @@ protected Package[] getPackages() { Map map; synchronized (packages) { @@ -1536,7 +1527,7 @@ } Package[] pkgs; if (parent != null) { -@@ -1782,17 +1783,20 @@ +@@ -1790,17 +1791,20 @@ } // All native library names we've loaded. @@ -1561,7 +1552,7 @@ // The paths searched for libraries private static String usr_paths[]; -@@ -2126,8 +2130,8 @@ +@@ -2134,8 +2138,8 @@ * them to empty maps, effectively ignoring any present settings. */ synchronized (assertionLock) { @@ -1572,7 +1563,7 @@ defaultAssertionStatus = false; } } -@@ -2189,8 +2193,8 @@ +@@ -2197,8 +2201,8 @@ private void initializeJavaAssertionMaps() { // assert Thread.holdsLock(assertionLock); @@ -1584,8 +1575,8 @@ for(int i = 0; i < directives.classes.length; i++) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2013-07-30 18:32:50.301582391 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2014-01-28 11:39:19.713589132 +0000 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -1626,9 +1617,128 @@ // As soon as the Entry is put into the cache, the value will be // reachable via a data race (as defined by the Java Memory Model). +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2014-01-28 11:38:19.404649541 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2014-01-28 11:39:19.713589132 +0000 +@@ -599,13 +599,16 @@ + } + + // The map of loaded system packages +- private static Map pkgs = new HashMap<>(31); ++ private static Map pkgs ++ = new HashMap(31); + + // Maps each directory or zip file name to its corresponding url +- private static Map urls = new HashMap<>(10); ++ private static Map urls ++ = new HashMap(10); + + // Maps each code source url for a jar file to its manifest +- private static Map mans = new HashMap<>(10); ++ private static Map mans ++ = new HashMap(10); + + private static native String getSystemPackage0(String name); + private static native String[] getSystemPackages0(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-01-28 11:38:19.384649230 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-01-28 11:39:19.713589132 +0000 +@@ -214,7 +214,7 @@ + * @param command a string array containing the program and its arguments + */ + public ProcessBuilder(String... command) { +- this.command = new ArrayList<>(command.length); ++ this.command = new ArrayList(command.length); + for (String arg : command) + this.command.add(arg); + } +@@ -251,7 +251,7 @@ + * @return this process builder + */ + public ProcessBuilder command(String... command) { +- this.command = new ArrayList<>(command.length); ++ this.command = new ArrayList(command.length); + for (String arg : command) + this.command.add(arg); + return this; +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2014-01-28 11:39:19.717589195 +0000 +@@ -2282,7 +2282,7 @@ + int off = 0; + int next = 0; + boolean limited = limit > 0; +- ArrayList list = new ArrayList<>(); ++ ArrayList list = new ArrayList(); + while ((next = indexOf(ch, off)) != -1) { + if (!limited || list.size() < limit - 1) { + list.add(substring(off, next)); +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2014-01-28 11:39:19.717589195 +0000 +@@ -53,9 +53,9 @@ + + /** The cached coders for each thread */ + private final static ThreadLocal> decoder = +- new ThreadLocal<>(); ++ new ThreadLocal>(); + private final static ThreadLocal> encoder = +- new ThreadLocal<>(); ++ new ThreadLocal>(); + + private static boolean warnUnsupportedCharset = true; + +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2014-01-28 11:39:19.717589195 +0000 +@@ -1637,7 +1637,8 @@ + // Get a snapshot of the list of all threads + Thread[] threads = getThreads(); + StackTraceElement[][] traces = dumpThreads(threads); +- Map m = new HashMap<>(threads.length); ++ Map m ++ = new HashMap(threads.length); + for (int i = 0; i < threads.length; i++) { + StackTraceElement[] stackTrace = traces[i]; + if (stackTrace != null) { +@@ -1658,11 +1659,11 @@ + private static class Caches { + /** cache of subclass security audit results */ + static final ConcurrentMap subclassAudits = +- new ConcurrentHashMap<>(); ++ new ConcurrentHashMap(); + + /** queue for WeakReferences to audited subclasses */ + static final ReferenceQueue> subclassAuditsQueue = +- new ReferenceQueue<>(); ++ new ReferenceQueue>(); + } + + /** +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2014-01-28 11:39:19.717589195 +0000 +@@ -918,7 +918,7 @@ + // Use the sentinel for a zero-length list + suppressed = SUPPRESSED_SENTINEL; + } else { // Copy Throwables to new list +- suppressed = new ArrayList<>(1); ++ suppressed = new ArrayList(1); + for (Throwable t : suppressedExceptions) { + // Enforce constraints on suppressed exceptions in + // case of corrupt or malicious stream. +@@ -1049,7 +1049,7 @@ + return; + + if (suppressedExceptions == SUPPRESSED_SENTINEL) +- suppressedExceptions = new ArrayList<>(1); ++ suppressedExceptions = new ArrayList(1); + + suppressedExceptions.add(exception); + } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-07-30 18:18:54.080413963 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-07-30 18:32:50.305582455 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-01-28 11:38:19.420649790 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-01-28 11:39:19.713589132 +0000 @@ -393,7 +393,7 @@ } private boolean isPlaceholder() { return clazz == null; } @@ -1639,8 +1749,8 @@ SpeciesData extendWithType(char type) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2013-07-30 18:32:50.305582455 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-01-28 11:39:19.713589132 +0000 @@ -326,7 +326,7 @@ if (UNSAFE.shouldBeInitialized(type)) // If the previous call didn't block, this can happen. @@ -1651,8 +1761,8 @@ } static final EnsureInitialized INSTANCE = new EnsureInitialized(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2013-07-30 18:18:54.080413963 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2013-07-30 18:32:50.305582455 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-01-28 11:38:19.420649790 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-01-28 11:39:19.713589132 +0000 @@ -129,7 +129,7 @@ static { @@ -1672,8 +1782,8 @@ int cph = 0; // for counting constant placeholders diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2013-07-30 18:18:54.080413963 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2013-07-30 18:32:50.305582455 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-01-28 11:38:19.424649852 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-01-28 11:39:19.713589132 +0000 @@ -468,12 +468,12 @@ int capacity = 512; // expect many distinct signatures over time float loadFactor = 0.75f; // normal default @@ -1690,8 +1800,8 @@ if (!m.isStatic() || !m.isPackage()) continue; MethodType mt = m.getMethodType(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2013-07-30 18:32:50.309582518 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2014-01-28 11:39:19.713589132 +0000 @@ -808,14 +808,14 @@ // JVM returned to us with an intentional overflow! totalCount += buf.length; @@ -1709,9 +1819,21 @@ if (bufs != null) { for (MemberName[] buf0 : bufs) { Collections.addAll(result, buf0); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-01-28 11:39:19.713589132 +0000 +@@ -824,7 +824,7 @@ + } + } + if (sawProblem) { +- ArrayList> ptypes = new ArrayList<>(type().parameterList()); ++ ArrayList> ptypes = new ArrayList>(type().parameterList()); + for (int i = nargs - arrayLength; i < nargs; i++) { + ptypes.set(i, arrayElement); + } 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 2013-07-30 18:18:54.080413963 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2013-07-30 18:32:50.313582581 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-01-28 11:38:19.424649852 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-01-28 11:39:19.713589132 +0000 @@ -73,8 +73,8 @@ static final class ArrayAccessor { @@ -1732,22 +1854,10 @@ MethodHandles.Lookup lookup = IMPL_LOOKUP; for (;;) { int nargs = invokes.size(); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2013-07-30 18:32:50.313582581 +0100 -@@ -824,7 +824,7 @@ - } - } - if (sawProblem) { -- ArrayList> ptypes = new ArrayList<>(type().parameterList()); -+ ArrayList> ptypes = new ArrayList>(type().parameterList()); - for (int i = nargs - arrayLength; i < nargs; i++) { - ptypes.set(i, arrayElement); - } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2013-07-30 18:32:50.317582643 +0100 -@@ -1795,7 +1795,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-01-28 11:39:19.713589132 +0000 +@@ -1808,7 +1808,7 @@ int inargs = outargs + dropped; if (pos < 0 || pos >= inargs) throw newIllegalArgumentException("no argument type to remove"); @@ -1757,8 +1867,8 @@ MethodType newType = MethodType.methodType(oldType.returnType(), ptypes); return target.dropArguments(newType, pos, dropped); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2013-07-30 18:32:50.317582643 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2014-01-28 11:39:19.713589132 +0000 @@ -1048,7 +1048,7 @@ private final float loadFactor; @@ -1769,8 +1879,8 @@ private Entry[] newTable(int n) { return new Entry[n]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-07-30 18:18:54.036413270 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-07-30 18:32:50.317582643 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-01-28 11:38:19.376649105 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-01-28 11:39:19.713589132 +0000 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -1781,8 +1891,8 @@ result.add(component.getMXBeanInterface()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2013-07-30 18:32:50.321582706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2014-01-28 11:39:19.713589132 +0000 @@ -287,7 +287,7 @@ List getGcMXBeanList(Class gcMXBeanIntf) { List list = @@ -1819,53 +1929,9 @@ for (PlatformComponent pc: PlatformComponent.values()) { // Use String as the key rather than Class to avoid // causing unnecessary class loading of management interface -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2013-07-30 18:18:54.060413647 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2013-07-30 18:32:50.321582706 +0100 -@@ -599,13 +599,16 @@ - } - - // The map of loaded system packages -- private static Map pkgs = new HashMap<>(31); -+ private static Map pkgs -+ = new HashMap(31); - - // Maps each directory or zip file name to its corresponding url -- private static Map urls = new HashMap<>(10); -+ private static Map urls -+ = new HashMap(10); - - // Maps each code source url for a jar file to its manifest -- private static Map mans = new HashMap<>(10); -+ private static Map mans -+ = new HashMap(10); - - private static native String getSystemPackage0(String name); - private static native String[] getSystemPackages0(); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-07-30 18:18:54.040413333 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-07-30 18:32:50.321582706 +0100 -@@ -214,7 +214,7 @@ - * @param command a string array containing the program and its arguments - */ - public ProcessBuilder(String... command) { -- this.command = new ArrayList<>(command.length); -+ this.command = new ArrayList(command.length); - for (String arg : command) - this.command.add(arg); - } -@@ -251,7 +251,7 @@ - * @return this process builder - */ - public ProcessBuilder command(String... command) { -- this.command = new ArrayList<>(command.length); -+ this.command = new ArrayList(command.length); - for (String arg : command) - this.command.add(arg); - return this; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2013-07-30 18:32:50.325582769 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2014-01-28 11:39:19.713589132 +0000 @@ -137,7 +137,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1876,8 +1942,8 @@ exceptionTypes, modifiers, slot, signature, diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-07-30 18:18:54.040413333 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-07-30 18:32:50.329582832 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-01-28 11:38:19.384649230 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-01-28 11:39:19.713589132 +0000 @@ -239,7 +239,7 @@ /** maps a class loader to the proxy class cache for that loader */ @@ -1906,8 +1972,8 @@ } /* diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2013-07-30 18:32:50.329582832 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2014-01-28 11:39:19.713589132 +0000 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1917,85 +1983,10 @@ parameterTypes, checkedExceptions, modifiers, -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2013-07-30 18:32:50.333582895 +0100 -@@ -53,9 +53,9 @@ - - /** The cached coders for each thread */ - private final static ThreadLocal> decoder = -- new ThreadLocal<>(); -+ new ThreadLocal>(); - private final static ThreadLocal> encoder = -- new ThreadLocal<>(); -+ new ThreadLocal>(); - - private static boolean warnUnsupportedCharset = true; - -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java openjdk-boot/jdk/src/share/classes/java/lang/String.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2013-07-30 18:32:50.333582895 +0100 -@@ -2282,7 +2282,7 @@ - int off = 0; - int next = 0; - boolean limited = limit > 0; -- ArrayList list = new ArrayList<>(); -+ ArrayList list = new ArrayList(); - while ((next = indexOf(ch, off)) != -1) { - if (!limited || list.size() < limit - 1) { - list.add(substring(off, next)); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java openjdk-boot/jdk/src/share/classes/java/lang/Thread.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2013-07-30 18:32:50.337582958 +0100 -@@ -1617,7 +1617,8 @@ - // Get a snapshot of the list of all threads - Thread[] threads = getThreads(); - StackTraceElement[][] traces = dumpThreads(threads); -- Map m = new HashMap<>(threads.length); -+ Map m -+ = new HashMap(threads.length); - for (int i = 0; i < threads.length; i++) { - StackTraceElement[] stackTrace = traces[i]; - if (stackTrace != null) { -@@ -1638,11 +1639,11 @@ - private static class Caches { - /** cache of subclass security audit results */ - static final ConcurrentMap subclassAudits = -- new ConcurrentHashMap<>(); -+ new ConcurrentHashMap(); - - /** queue for WeakReferences to audited subclasses */ - static final ReferenceQueue> subclassAuditsQueue = -- new ReferenceQueue<>(); -+ new ReferenceQueue>(); - } - - /** -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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2013-07-30 18:32:50.341583022 +0100 -@@ -918,7 +918,7 @@ - // Use the sentinel for a zero-length list - suppressed = SUPPRESSED_SENTINEL; - } else { // Copy Throwables to new list -- suppressed = new ArrayList<>(1); -+ suppressed = new ArrayList(1); - for (Throwable t : suppressedExceptions) { - // Enforce constraints on suppressed exceptions in - // case of corrupt or malicious stream. -@@ -1049,7 +1049,7 @@ - return; - - if (suppressedExceptions == SUPPRESSED_SENTINEL) -- suppressedExceptions = new ArrayList<>(1); -+ suppressedExceptions = new ArrayList(1); - - suppressedExceptions.add(exception); - } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java ---- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2013-07-30 18:32:50.341583022 +0100 -@@ -705,7 +705,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2014-01-28 11:39:19.717589195 +0000 +@@ -712,7 +712,7 @@ static InetAddressImpl impl; @@ -2004,7 +1995,7 @@ /** * Represents a cache entry -@@ -764,7 +764,7 @@ +@@ -771,7 +771,7 @@ // As we iterate in insertion order we can // terminate when a non-expired entry is found. @@ -2014,8 +2005,8 @@ for (String key : cache.keySet()) { CacheEntry entry = cache.get(key); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2013-07-30 18:32:50.345583085 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2014-01-28 11:39:19.717589195 +0000 @@ -205,7 +205,7 @@ */ @@ -2026,8 +2017,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 2013-07-30 18:18:54.060413647 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2013-07-30 18:32:50.349583148 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2014-01-28 11:38:19.404649541 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2014-01-28 11:39:19.717589195 +0000 @@ -1502,7 +1502,7 @@ return AccessController .doPrivileged(new PrivilegedAction>() { @@ -2047,8 +2038,8 @@ String line = reader.readLine(); if (line == null) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2013-07-30 18:32:50.349583148 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2014-01-28 11:39:19.717589195 +0000 @@ -127,7 +127,7 @@ this.context = null; } @@ -2059,8 +2050,8 @@ if ((context[i] != null) && (!v.contains(context[i]))) v.add(context[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2013-07-30 18:32:50.349583148 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2014-01-28 11:39:19.717589195 +0000 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -2071,8 +2062,8 @@ synchronized (this) { permissions.putAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2013-07-30 18:32:50.353583211 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2014-01-28 11:39:19.717589195 +0000 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -2096,8 +2087,8 @@ int j = i; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java openjdk-boot/jdk/src/share/classes/java/security/Permissions.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2013-07-30 18:32:50.353583211 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2014-01-28 11:39:19.717589195 +0000 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -2117,8 +2108,8 @@ perms.putAll(permsMap); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java openjdk-boot/jdk/src/share/classes/java/security/Policy.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2013-07-30 18:32:50.353583211 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2014-01-28 11:39:19.717589195 +0000 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -2138,8 +2129,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2013-07-30 18:32:50.357583274 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2014-01-28 11:39:19.717589195 +0000 @@ -373,8 +373,8 @@ int swag = 32; int vcap = 8; @@ -2152,8 +2143,8 @@ // // Build a vector of domain permissions for subsequent merge diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java openjdk-boot/jdk/src/share/classes/java/security/Provider.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2013-07-30 18:32:50.357583274 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2014-01-28 11:39:19.717589195 +0000 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -2182,8 +2173,8 @@ Class clazz = getKeyClass(className); if (clazz != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2013-07-30 18:32:50.361583337 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2014-01-28 11:39:19.717589195 +0000 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -2194,8 +2185,8 @@ private static final Debug debug = Debug.getInstance("scl"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java openjdk-boot/jdk/src/share/classes/java/security/Security.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2013-07-30 18:32:50.361583337 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2014-01-28 11:39:19.717589195 +0000 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -2241,9 +2232,21 @@ Provider[] providers = Security.getProviders(); for (int i = 0; i < providers.length; i++) { +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2014-01-28 11:39:19.721589257 +0000 +@@ -198,7 +198,7 @@ + if (this.certs == null) { + // extract the signer certs + ArrayList signerCerts = +- new ArrayList<>(); ++ new ArrayList(); + i = 0; + while (i < certs.length) { + signerCerts.add(certs[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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2013-07-30 18:32:50.361583337 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2014-01-28 11:39:19.717589195 +0000 @@ -119,7 +119,7 @@ public Enumeration elements() { @@ -2280,21 +2283,9 @@ list.addAll(vec); // 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2013-07-30 18:32:50.365583400 +0100 -@@ -198,7 +198,7 @@ - if (this.certs == null) { - // extract the signer certs - ArrayList signerCerts = -- new ArrayList<>(); -+ new ArrayList(); - i = 0; - while (i < certs.length) { - signerCerts.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2013-07-30 18:32:50.365583400 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2014-01-28 11:39:19.721589257 +0000 @@ -482,8 +482,8 @@ */ public List subList(int fromIndex, int toIndex) { @@ -2324,8 +2315,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java openjdk-boot/jdk/src/share/classes/java/util/Arrays.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2013-07-30 18:32:50.365583400 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2014-01-28 11:39:19.721589257 +0000 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -2336,8 +2327,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java openjdk-boot/jdk/src/share/classes/java/util/Collections.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2013-07-30 18:32:50.369583463 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2014-01-28 11:39:19.721589257 +0000 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -2963,8 +2954,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2013-07-30 18:32:50.369583463 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2014-01-28 11:39:19.721589257 +0000 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -2975,8 +2966,8 @@ return a; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2013-07-30 18:32:50.373583526 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2014-01-28 11:39:19.721589257 +0000 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -2999,8 +2990,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 2013-07-30 18:18:54.036413270 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2013-07-30 18:32:50.373583526 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2014-01-28 11:38:19.376649105 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2014-01-28 11:39:19.721589257 +0000 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -3011,8 +3002,8 @@ for (int i = 0, len = s.length(); i < len; ) { if (m.find(i)) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java openjdk-boot/jdk/src/share/classes/java/util/HashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2013-07-30 18:32:50.377583589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2014-01-28 11:39:19.721589257 +0000 @@ -898,7 +898,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -3023,8 +3014,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java openjdk-boot/jdk/src/share/classes/java/util/HashSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2013-07-30 18:32:50.377583589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2014-01-28 11:39:19.721589257 +0000 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -3071,8 +3062,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2013-07-30 18:32:50.377583589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2014-01-28 11:39:19.721589257 +0000 @@ -538,7 +538,7 @@ // Creates the new entry. @@ -3128,8 +3119,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2013-07-30 18:32:50.381583652 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2014-01-28 11:39:19.721589257 +0000 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator> it = iterator(); @@ -3149,8 +3140,8 @@ a[size] = null; return a; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2013-07-30 18:32:50.381583652 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2014-01-28 11:39:19.721589257 +0000 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -3161,8 +3152,8 @@ private class EnumSetIterator> implements Iterator { 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2013-07-30 18:32:50.381583652 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2014-01-28 11:39:19.721589257 +0000 @@ -238,7 +238,7 @@ */ @Override @@ -3182,8 +3173,8 @@ e.addBefore(header); size++; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2013-07-30 18:32:50.385583715 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2014-01-28 11:39:19.725589319 +0000 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -3221,8 +3212,8 @@ first = newNode; else diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2013-07-30 18:32:50.385583715 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2014-01-28 11:39:19.725589319 +0000 @@ -187,7 +187,7 @@ return; @@ -3233,8 +3224,8 @@ // key must be non-null String, value must be non-null String key = (String) contents[i][0]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java openjdk-boot/jdk/src/share/classes/java/util/Locale.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2013-07-30 18:32:50.385583715 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2014-01-28 11:39:19.725589319 +0000 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -3244,178 +3235,9 @@ 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2013-07-30 18:32:50.389583779 +0100 -@@ -127,7 +127,7 @@ - private FileOutputStream lockStream; - private File files[]; - private static final int MAX_LOCKS = 100; -- private static java.util.HashMap locks = new java.util.HashMap<>(); -+ private static java.util.HashMap locks = new java.util.HashMap(); - - // A metered stream is a subclass of OutputStream that - // (a) forwards all its output to a target stream -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2013-07-30 18:32:50.389583779 +0100 -@@ -458,8 +458,8 @@ - // were final, the following KnownLevel implementation can be removed. - // Future API change should take this into consideration. - static final class KnownLevel { -- private static Map> nameToLevels = new HashMap<>(); -- private static Map> intToLevels = new HashMap<>(); -+ private static Map> nameToLevels = new HashMap>(); -+ private static Map> intToLevels = new HashMap>(); - final Level levelObject; // instance of Level class or Level subclass - final Level mirroredLevel; // instance of Level class - KnownLevel(Level l) { -@@ -477,14 +477,14 @@ - KnownLevel o = new KnownLevel(l); - List list = nameToLevels.get(l.name); - if (list == null) { -- list = new ArrayList<>(); -+ list = new ArrayList(); - nameToLevels.put(l.name, list); - } - list.add(o); - - list = intToLevels.get(l.value); - if (list == null) { -- list = new ArrayList<>(); -+ list = new ArrayList(); - intToLevels.put(l.value, list); - } - list.add(o); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2013-07-30 18:32:50.393583842 +0100 -@@ -177,7 +177,7 @@ - private LogManager manager; - private String name; - private final CopyOnWriteArrayList handlers = -- new CopyOnWriteArrayList<>(); -+ new CopyOnWriteArrayList(); - private String resourceBundleName; - private volatile boolean useParentHandlers = true; - private volatile Filter filter; -@@ -1591,7 +1591,7 @@ - // Set our new parent. - parent = newParent; - if (parent.kids == null) { -- parent.kids = new ArrayList<>(2); -+ parent.kids = new ArrayList(2); - } - if (ref == null) { - // we didn't have a previous parent -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2013-07-30 18:32:50.393583842 +0100 -@@ -56,7 +56,7 @@ - - public List getLoggerNames() { - Enumeration loggers = logManager.getLoggerNames(); -- ArrayList array = new ArrayList<>(); -+ ArrayList array = new ArrayList(); - - for (; loggers.hasMoreElements();) { - array.add((String) loggers.nextElement()); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2013-07-30 18:33:42.826410509 +0100 -@@ -384,7 +384,7 @@ - } - - private List contexts() { -- List cxs = new ArrayList<>(); -+ List cxs = new ArrayList(); - cxs.add(systemContext); - cxs.add(getUserContext()); - return cxs; -@@ -477,7 +477,7 @@ - // added in the user context. - static class LoggerContext { - // Table of named Loggers that maps names to Loggers. -- private final Hashtable namedLoggers = new Hashtable<>(); -+ private final Hashtable namedLoggers = new Hashtable(); - // Tree of named Loggers - private final LogNode root; - private final boolean requiresDefaultLoggers; -@@ -720,7 +720,7 @@ - name = ""; - } - if (node.children == null) { -- node.children = new HashMap<>(); -+ node.children = new HashMap(); - } - LogNode child = node.children.get(head); - if (child == null) { -@@ -812,7 +812,7 @@ - // loggerRefQueue holds LoggerWeakRef objects for Logger objects - // that have been GC'ed. - private final ReferenceQueue loggerRefQueue -- = new ReferenceQueue<>(); -+ = new ReferenceQueue(); - - // Package-level inner class. - // Helper class for managing WeakReferences to Logger objects. -@@ -1155,7 +1155,7 @@ - } - hands = hands.trim(); - int ix = 0; -- Vector result = new Vector<>(); -+ Vector result = new Vector(); - while (ix < hands.length()) { - int end = ix; - while (end < hands.length()) { -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2013-07-30 18:32:50.401583968 +0100 -@@ -85,7 +85,8 @@ - private static final AtomicInteger nextThreadId - = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); - -- private static final ThreadLocal threadIds = new ThreadLocal<>(); -+ private static final ThreadLocal threadIds -+ = new ThreadLocal(); - - /** - * @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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2013-07-30 18:32:50.405584031 +0100 -@@ -155,7 +155,8 @@ - * All known unremoved children of this node. (This "cache" is consulted - * prior to calling childSpi() or getChild(). - */ -- private Map kidCache = new HashMap<>(); -+ private Map kidCache -+ = new HashMap(); - - /** - * This field is used to keep track of whether or not this node has -@@ -712,7 +713,7 @@ - if (removed) - throw new IllegalStateException("Node has been removed."); - -- Set s = new TreeSet<>(kidCache.keySet()); -+ Set s = new TreeSet(kidCache.keySet()); - for (String kid : childrenNamesSpi()) - s.add(kid); - return s.toArray(EMPTY_STRING_ARRAY); -@@ -1441,7 +1442,8 @@ - * event delivery from preference activity, greatly simplifying - * locking and reducing opportunity for deadlock. - */ -- private static final List eventQueue = new LinkedList<>(); -+ private static final List eventQueue -+ = new LinkedList(); - - /** - * 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2013-07-30 18:32:50.405584031 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2014-01-28 11:39:19.725589319 +0000 @@ -538,7 +538,7 @@ cursor--; else { @@ -3426,8 +3248,8 @@ } } else if (lastRetElt != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java openjdk-boot/jdk/src/share/classes/java/util/Properties.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2013-07-30 18:32:50.409584094 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2014-01-28 11:39:19.725589319 +0000 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -3437,62 +3259,9 @@ enumerateStringProperties(h); return h.keySet(); } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2013-07-30 18:32:50.409584094 +0100 -@@ -321,7 +321,7 @@ - * Nothing, but quotes all characters until \E - * \E - * Nothing, but ends quoting started by \Q -- * -+ * - * - *   - * Special constructs (named-capturing and non-capturing) -@@ -1193,7 +1193,7 @@ - public String[] split(CharSequence input, int limit) { - int index = 0; - boolean matchLimited = limit > 0; -- ArrayList matchList = new ArrayList<>(); -+ ArrayList matchList = new ArrayList(); - Matcher m = matcher(input); - - // Add segments before each match found -@@ -1695,7 +1695,7 @@ - - Map namedGroups() { - if (namedGroups == null) -- namedGroups = new HashMap<>(2); -+ namedGroups = new HashMap(2); - return namedGroups; - } - -@@ -5495,7 +5495,7 @@ - } - - private static final HashMap map -- = new HashMap<>(); -+ = new HashMap(); - - 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2013-07-30 18:32:50.409584094 +0100 -@@ -193,8 +193,8 @@ - } - }; - -- private final static HashMap posix = new HashMap<>(); -- private final static HashMap aliases = new HashMap<>(); -+ private final static HashMap posix = new HashMap(); -+ private final static HashMap aliases = new HashMap(); - 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2013-07-30 18:32:50.413584157 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2014-01-28 11:39:19.725589319 +0000 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -3503,8 +3272,8 @@ private class EnumSetIterator> implements Iterator { 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2013-07-30 18:32:50.421584283 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2014-01-28 11:39:19.725589319 +0000 @@ -291,7 +291,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -3569,8 +3338,8 @@ if (variants != null) { for (String v : variants) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2013-07-30 18:32:50.421584283 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2014-01-28 11:39:19.729589382 +0000 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3599,8 +3368,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java openjdk-boot/jdk/src/share/classes/java/util/TimSort.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2013-07-30 18:32:50.421584283 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2014-01-28 11:39:19.729589382 +0000 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3611,8 +3380,8 @@ do { // Identify next run diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2013-07-30 18:32:50.425584346 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2014-01-28 11:39:19.729589382 +0000 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3668,8 +3437,8 @@ // color nodes in non-full bottommost level red if (level == redLevel) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2013-07-30 18:32:50.425584346 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2014-01-28 11:39:19.729589382 +0000 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3737,8 +3506,8 @@ // Read in size diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2013-07-30 18:32:50.425584346 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2014-01-28 11:39:19.729589382 +0000 @@ -172,7 +172,7 @@ /** * Reference queue for cleared WeakEntries @@ -3770,9 +3539,231 @@ return list; } +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2014-01-28 11:39:19.725589319 +0000 +@@ -127,7 +127,7 @@ + private FileOutputStream lockStream; + private File files[]; + private static final int MAX_LOCKS = 100; +- private static java.util.HashMap locks = new java.util.HashMap<>(); ++ private static java.util.HashMap locks = new java.util.HashMap(); + + // A metered stream is a subclass of OutputStream that + // (a) forwards all its output to a target stream +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2014-01-28 11:39:19.725589319 +0000 +@@ -458,8 +458,8 @@ + // were final, the following KnownLevel implementation can be removed. + // Future API change should take this into consideration. + static final class KnownLevel { +- private static Map> nameToLevels = new HashMap<>(); +- private static Map> intToLevels = new HashMap<>(); ++ private static Map> nameToLevels = new HashMap>(); ++ private static Map> intToLevels = new HashMap>(); + final Level levelObject; // instance of Level class or Level subclass + final Level mirroredLevel; // instance of Level class + KnownLevel(Level l) { +@@ -477,14 +477,14 @@ + KnownLevel o = new KnownLevel(l); + List list = nameToLevels.get(l.name); + if (list == null) { +- list = new ArrayList<>(); ++ list = new ArrayList(); + nameToLevels.put(l.name, list); + } + list.add(o); + + list = intToLevels.get(l.value); + if (list == null) { +- list = new ArrayList<>(); ++ list = new ArrayList(); + intToLevels.put(l.value, list); + } + list.add(o); +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2014-01-28 11:39:19.725589319 +0000 +@@ -402,7 +402,7 @@ + } + + private List contexts() { +- List cxs = new ArrayList<>(); ++ List cxs = new ArrayList(); + cxs.add(systemContext); + cxs.add(getUserContext()); + return cxs; +@@ -495,7 +495,7 @@ + // added in the user context. + static class LoggerContext { + // Table of named Loggers that maps names to Loggers. +- private final Hashtable namedLoggers = new Hashtable<>(); ++ private final Hashtable namedLoggers = new Hashtable(); + // Tree of named Loggers + private final LogNode root; + private final boolean requiresDefaultLoggers; +@@ -738,7 +738,7 @@ + name = ""; + } + if (node.children == null) { +- node.children = new HashMap<>(); ++ node.children = new HashMap(); + } + LogNode child = node.children.get(head); + if (child == null) { +@@ -830,7 +830,7 @@ + // loggerRefQueue holds LoggerWeakRef objects for Logger objects + // that have been GC'ed. + private final ReferenceQueue loggerRefQueue +- = new ReferenceQueue<>(); ++ = new ReferenceQueue(); + + // Package-level inner class. + // Helper class for managing WeakReferences to Logger objects. +@@ -1173,7 +1173,7 @@ + } + hands = hands.trim(); + int ix = 0; +- Vector result = new Vector<>(); ++ Vector result = new Vector(); + while (ix < hands.length()) { + int end = ix; + while (end < hands.length()) { +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2014-01-28 11:39:19.725589319 +0000 +@@ -85,7 +85,8 @@ + private static final AtomicInteger nextThreadId + = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); + +- private static final ThreadLocal threadIds = new ThreadLocal<>(); ++ private static final ThreadLocal threadIds ++ = new ThreadLocal(); + + /** + * @serial Logging message level +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2014-01-28 11:39:19.725589319 +0000 +@@ -177,7 +177,7 @@ + private LogManager manager; + private String name; + private final CopyOnWriteArrayList handlers = +- new CopyOnWriteArrayList<>(); ++ new CopyOnWriteArrayList(); + private String resourceBundleName; + private volatile boolean useParentHandlers = true; + private volatile Filter filter; +@@ -1591,7 +1591,7 @@ + // Set our new parent. + parent = newParent; + if (parent.kids == null) { +- parent.kids = new ArrayList<>(2); ++ parent.kids = new ArrayList(2); + } + if (ref == null) { + // we didn't have a previous parent +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2014-01-28 11:39:19.725589319 +0000 +@@ -56,7 +56,7 @@ + + public List getLoggerNames() { + Enumeration loggers = logManager.getLoggerNames(); +- ArrayList array = new ArrayList<>(); ++ ArrayList array = new ArrayList(); + + for (; loggers.hasMoreElements();) { + array.add((String) loggers.nextElement()); +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2014-01-28 11:39:19.725589319 +0000 +@@ -155,7 +155,8 @@ + * All known unremoved children of this node. (This "cache" is consulted + * prior to calling childSpi() or getChild(). + */ +- private Map kidCache = new HashMap<>(); ++ private Map kidCache ++ = new HashMap(); + + /** + * This field is used to keep track of whether or not this node has +@@ -712,7 +713,7 @@ + if (removed) + throw new IllegalStateException("Node has been removed."); + +- Set s = new TreeSet<>(kidCache.keySet()); ++ Set s = new TreeSet(kidCache.keySet()); + for (String kid : childrenNamesSpi()) + s.add(kid); + return s.toArray(EMPTY_STRING_ARRAY); +@@ -1441,7 +1442,8 @@ + * event delivery from preference activity, greatly simplifying + * locking and reducing opportunity for deadlock. + */ +- private static final List eventQueue = new LinkedList<>(); ++ private static final List eventQueue ++ = new LinkedList(); + + /** + * These two classes are used to distinguish NodeChangeEvents on +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2014-01-28 11:39:19.725589319 +0000 +@@ -321,7 +321,7 @@ + * Nothing, but quotes all characters until \E + * \E + * Nothing, but ends quoting started by \Q +- * ++ * + * + *   + * Special constructs (named-capturing and non-capturing) +@@ -1193,7 +1193,7 @@ + public String[] split(CharSequence input, int limit) { + int index = 0; + boolean matchLimited = limit > 0; +- ArrayList matchList = new ArrayList<>(); ++ ArrayList matchList = new ArrayList(); + Matcher m = matcher(input); + + // Add segments before each match found +@@ -1695,7 +1695,7 @@ + + Map namedGroups() { + if (namedGroups == null) +- namedGroups = new HashMap<>(2); ++ namedGroups = new HashMap(2); + return namedGroups; + } + +@@ -5495,7 +5495,7 @@ + } + + private static final HashMap map +- = new HashMap<>(); ++ = new HashMap(); + + 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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2014-01-28 11:39:19.725589319 +0000 +@@ -193,8 +193,8 @@ + } + }; + +- private final static HashMap posix = new HashMap<>(); +- private final static HashMap aliases = new HashMap<>(); ++ private final static HashMap posix = new HashMap(); ++ private final static HashMap aliases = new HashMap(); + static { + posix.put("ALPHA", "ALPHABETIC"); + posix.put("LOWER", "LOWERCASE"); 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2013-07-30 18:32:50.429584409 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2014-01-28 11:39:19.729589382 +0000 @@ -321,7 +321,7 @@ // the outstanding inputstreams that need to be closed, @@ -3801,8 +3792,8 @@ for (Map.Entry e : copy.entrySet()) { e.getKey().close(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2013-07-30 18:32:50.433584472 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2014-01-28 11:39:19.729589382 +0000 @@ -53,8 +53,8 @@ } @@ -3815,8 +3806,8 @@ private long written = 0; private long locoff = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2013-07-30 18:32:50.433584472 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2014-01-28 11:39:19.729589382 +0000 @@ -84,7 +84,7 @@ * no CryptoPermissionCollections. */ @@ -3855,8 +3846,8 @@ fields.put("perms", permTable); s.writeFields(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2013-07-30 18:32:50.433584472 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2014-01-28 11:39:19.729589382 +0000 @@ -54,7 +54,7 @@ private static final CryptoAllPermission allPerm; private static final Vector TrustedCallersCache = new Vector(2); @@ -3866,9 +3857,33 @@ private static final CryptoPermissions CACHE_NULL_MARK = new CryptoPermissions(); +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2014-01-28 11:39:19.729589382 +0000 +@@ -329,7 +329,7 @@ + throw new IllegalArgumentException("invalid empty name"); + } + +- ArrayList pList = new ArrayList<>(); ++ ArrayList pList = new ArrayList(); + StringTokenizer tokenizer = new StringTokenizer(name, " ", true); + String principalClass = null; + String principalName = null; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2014-01-28 11:39:19.729589382 +0000 +@@ -48,7 +48,7 @@ + + private Subject subject; + private WeakKeyValueMap cachedPDs = +- new WeakKeyValueMap<>(); ++ new WeakKeyValueMap(); + private Set principalSet; + private Principal[] principals; + 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2013-07-30 18:32:50.437584536 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2014-01-28 11:39:19.729589382 +0000 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -3879,8 +3894,8 @@ synchronized (this) { permissions.addAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2013-07-30 18:32:50.437584536 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2014-01-28 11:39:19.729589382 +0000 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -3890,33 +3905,9 @@ synchronized (this) { permissions.addAll(perms); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2013-07-30 18:32:50.437584536 +0100 -@@ -329,7 +329,7 @@ - throw new IllegalArgumentException("invalid empty name"); - } - -- ArrayList pList = new ArrayList<>(); -+ ArrayList pList = new ArrayList(); - StringTokenizer tokenizer = new StringTokenizer(name, " ", true); - String principalClass = null; - String principalName = null; -diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2013-07-30 18:32:50.441584599 +0100 -@@ -48,7 +48,7 @@ - - private Subject subject; - private WeakKeyValueMap cachedPDs = -- new WeakKeyValueMap<>(); -+ new WeakKeyValueMap(); - private Set principalSet; - private Principal[] principals; - diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-07-30 18:32:50.621587436 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-01-28 11:39:19.729589382 +0000 @@ -106,7 +106,7 @@ * Note that this only applies to createFont() from an InputStream object. */ @@ -3927,8 +3918,8 @@ private static Thread t = null; static void init() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-07-30 18:18:54.076413900 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-07-30 18:32:50.441584599 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-01-28 11:38:19.420649790 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-01-28 11:39:19.729589382 +0000 @@ -60,7 +60,7 @@ EnumMap[] caches = (EnumMap[]) new EnumMap[n]; @@ -3966,8 +3957,8 @@ MethodHandle mh = findCollector("list", mhs.size(), List.class); if (mh == null) break; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2013-07-30 18:32:50.441584599 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2014-01-28 11:39:19.729589382 +0000 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -3978,8 +3969,8 @@ aliasTable.put("us-ascii", "ASCII"); aliasTable.put("ascii", "ASCII"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java openjdk-boot/jdk/src/share/classes/sun/io/Converters.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2013-07-30 18:32:50.441584599 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2014-01-28 11:39:19.729589382 +0000 @@ -120,7 +120,7 @@ private static Class cache(int type, Object encoding, Class c) { @@ -3990,8 +3981,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 2013-07-30 18:18:54.064413711 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-07-30 18:32:50.445584662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-01-28 11:38:19.408649603 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-01-28 11:39:19.729589382 +0000 @@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -4028,9 +4019,21 @@ if (trace) { System.err.println("Incoming arguments:"); } +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2014-01-28 11:39:19.729589382 +0000 +@@ -205,7 +205,7 @@ + private static List bufferPools = null; + public static synchronized List getBufferPoolMXBeans() { + if (bufferPools == null) { +- bufferPools = new ArrayList<>(2); ++ bufferPools = new ArrayList(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/management/jdp/JdpPacketReader.java openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2013-07-30 18:32:50.445584662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2014-01-28 11:39:19.729589382 +0000 @@ -120,7 +120,7 @@ String key = null, value = null; @@ -4040,21 +4043,9 @@ try { while (true) { key = getEntry(); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2013-07-30 18:32:50.445584662 +0100 -@@ -205,7 +205,7 @@ - private static List bufferPools = null; - public static synchronized List getBufferPoolMXBeans() { - if (bufferPools == null) { -- bufferPools = new ArrayList<>(2); -+ bufferPools = new ArrayList(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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2013-07-30 18:32:50.449584725 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2014-01-28 11:39:19.729589382 +0000 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -4082,9 +4073,21 @@ Attributes attrs; // do the query +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2014-01-28 11:39:19.733589444 +0000 +@@ -239,7 +239,7 @@ + url = null; + } + +- private static HashMap proxiedHosts = new HashMap<>(); ++ private static HashMap proxiedHosts = new HashMap(); + + public synchronized static void setProxiedHost(String host) { + proxiedHosts.put(host.toLowerCase(), null); 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2013-07-30 18:32:50.449584725 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2014-01-28 11:39:19.729589382 +0000 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -4095,8 +4098,8 @@ /* check if a request for this destination is in progress * return false immediately if not. Otherwise block until diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2013-07-30 18:32:50.449584725 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2014-01-28 11:39:19.733589444 +0000 @@ -2646,7 +2646,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -4115,21 +4118,9 @@ for (String value : values) { String fVal = filterHeaderField(key, value); if (fVal != null) -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2013-07-30 18:32:50.453584788 +0100 -@@ -239,7 +239,7 @@ - url = null; - } - -- private static HashMap proxiedHosts = new HashMap<>(); -+ private static HashMap proxiedHosts = new HashMap(); - - public synchronized static void setProxiedHost(String host) { - proxiedHosts.put(host.toLowerCase(), null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2013-07-30 18:32:50.453584788 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2014-01-28 11:39:19.733589444 +0000 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -4167,8 +4158,8 @@ return new Iterator() { 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2013-07-30 18:32:50.453584788 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2014-01-28 11:39:19.733589444 +0000 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -4179,8 +4170,8 @@ result.put(ACL_NAME, getAcl()); if (owner) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2013-07-30 18:32:50.457584852 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2014-01-28 11:39:19.733589444 +0000 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -4193,8 +4184,8 @@ private AttributesBuilder(Set 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2013-07-30 18:32:50.457584852 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2014-01-28 11:39:19.733589444 +0000 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -4205,8 +4196,8 @@ // standard events if (event == StandardWatchEventKinds.ENTRY_CREATE || diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2013-07-30 18:32:50.457584852 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2014-01-28 11:39:19.733589444 +0000 @@ -77,7 +77,7 @@ throws IOException { @@ -4226,8 +4217,8 @@ int size = size(name); byte[] buf = new byte[size]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2013-07-30 18:32:50.457584852 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2014-01-28 11:39:19.733589444 +0000 @@ -71,7 +71,7 @@ @Override @@ -4238,8 +4229,8 @@ if (attribute.equals("*") || attribute.equals(OWNER_NAME)) { result.put(OWNER_NAME, getOwner()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2013-07-30 18:32:50.461584913 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2014-01-28 11:39:19.733589444 +0000 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -4259,8 +4250,8 @@ set.add(e); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2013-07-30 18:32:50.461584913 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2014-01-28 11:39:19.733589444 +0000 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -4325,8 +4316,8 @@ ets.add(parseThrowsSignature()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2013-07-30 18:32:50.461584913 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-01-28 11:39:19.733589444 +0000 @@ -78,9 +78,9 @@ /* indicate compatibility with JDK 1.1.x version of class */ private static final long serialVersionUID = 4666870661827494597L; @@ -4340,8 +4331,8 @@ private static ObjID id = new ObjID(ObjID.REGISTRY_ID); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2013-07-30 18:32:50.465584976 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2014-01-28 11:39:19.733589444 +0000 @@ -160,7 +160,7 @@ } @@ -4352,8 +4343,8 @@ /** * Remember a generated source file generated so that it diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2013-07-30 18:32:50.465584976 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2014-01-28 11:39:19.733589444 +0000 @@ -184,7 +184,7 @@ destDir = null; flags = F_WARNINGS; @@ -4373,8 +4364,8 @@ // Pre-process command line for @file arguments try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2013-07-30 18:32:50.465584976 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2014-01-28 11:39:19.733589444 +0000 @@ -61,7 +61,7 @@ */ public class RMIGenerator implements RMIConstants, Generator { @@ -4393,25 +4384,9 @@ uniqueList.addElement(defRuntimeException); uniqueList.addElement(defRemoteException); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-07-30 18:18:54.036413270 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-07-30 18:32:50.469585039 +0100 -@@ -66,10 +66,10 @@ - - /** maps persistent IDs to activated remote objects */ - private final Hashtable active = -- new Hashtable<>(); -+ new Hashtable(); - private boolean groupInactive = false; - private final ActivationGroupID groupID; -- private final List lockedIDs = new ArrayList<>(); -+ private final List lockedIDs = new ArrayList(); - - /** - * Creates a default activation group implementation. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2013-07-30 18:18:54.064413711 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2013-07-30 18:32:50.469585039 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-01-28 11:38:19.408649603 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-01-28 11:39:19.733589444 +0000 @@ -149,10 +149,10 @@ /** maps activation id to its respective group id */ @@ -4467,9 +4442,25 @@ /* * Parse arguments +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-01-28 11:38:19.380649167 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-01-28 11:39:19.733589444 +0000 +@@ -66,10 +66,10 @@ + + /** maps persistent IDs to activated remote objects */ + private final Hashtable active = +- new Hashtable<>(); ++ new Hashtable(); + private boolean groupInactive = false; + private final ActivationGroupID groupID; +- private final List lockedIDs = new ArrayList<>(); ++ private final List lockedIDs = new ArrayList(); + + /** + * Creates a default activation group implementation. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-07-30 18:18:54.036413270 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-07-30 18:32:50.473585103 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-01-28 11:38:19.380649167 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-01-28 11:39:19.733589444 +0000 @@ -113,11 +113,11 @@ * garbage collected. */ @@ -4494,8 +4485,8 @@ /** * Convert an array of URL objects into a corresponding string diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2013-07-30 18:32:50.473585103 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2014-01-28 11:39:19.733589444 +0000 @@ -71,14 +71,14 @@ /** table to hold sun classes to which access is explicitly permitted */ @@ -4514,8 +4505,8 @@ /** * if true, load classes (if not available locally) only from the diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2013-07-30 18:32:50.473585103 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2014-01-28 11:39:19.733589444 +0000 @@ -537,7 +537,7 @@ HashToMethod_Maps() {} @@ -4526,8 +4517,8 @@ cl != null; cl = cl.getSuperclass()) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2013-07-30 18:32:50.477585166 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2014-01-28 11:39:19.733589444 +0000 @@ -207,7 +207,7 @@ * @throws NullPointerException if remoteClass is null */ @@ -4538,8 +4529,8 @@ return list.toArray(new Class[list.size()]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2013-07-30 18:32:50.477585166 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2014-01-28 11:39:19.733589444 +0000 @@ -46,7 +46,7 @@ **/ public abstract class WeakClassHashMap { @@ -4550,8 +4541,8 @@ protected WeakClassHashMap() { } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2013-07-30 18:32:50.477585166 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2014-01-28 11:39:19.733589444 +0000 @@ -43,7 +43,7 @@ private boolean dgcAckNeeded = false; @@ -4562,8 +4553,8 @@ /** identifier for gc ack*/ private UID ackID; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2013-07-30 18:32:50.481585229 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2014-01-28 11:39:19.733589444 +0000 @@ -78,7 +78,7 @@ Collections.synchronizedMap(new HashMap()); @@ -4574,8 +4565,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2013-07-30 18:32:50.481585229 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2014-01-28 11:39:19.733589444 +0000 @@ -176,9 +176,9 @@ private DGC dgc; @@ -4647,8 +4638,8 @@ private boolean dirtyFailed = false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2013-07-30 18:32:50.481585229 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2014-01-28 11:39:19.733589444 +0000 @@ -84,7 +84,7 @@ /** remote implementation of DGC interface for this VM */ private static DGCImpl dgc; @@ -4677,8 +4668,8 @@ LeaseInfo(VMID vmid, long lease) { this.vmid = vmid; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2013-07-30 18:32:50.485585292 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2014-01-28 11:39:19.733589444 +0000 @@ -62,9 +62,9 @@ /** tables mapping to Target, keyed from ObjectEndpoint and impl object */ @@ -4700,9 +4691,37 @@ /** handle for GC latency request (for future cancellation) */ private static GC.LatencyRequest gcLatencyRequest = null; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2014-01-28 11:39:19.737589506 +0000 +@@ -53,10 +53,10 @@ + /** stub for remote object */ + private final Remote stub; + /** set of clients that hold references to this target */ +- private final Vector refSet = new Vector<>(); ++ private final Vector refSet = new Vector(); + /** table that maps client endpoints to sequence numbers */ + private final Hashtable sequenceTable = +- new Hashtable<>(5); ++ new Hashtable(5); + /** access control context in which target was created */ + private final AccessControlContext acc; + /** context class loader in which target was created */ +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2014-01-28 11:39:19.737589506 +0000 +@@ -62,7 +62,7 @@ + Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel); + + /** References the current transport when a call is being serviced */ +- private static final ThreadLocal currentTransport = new ThreadLocal<>(); ++ private static final ThreadLocal currentTransport = new ThreadLocal(); + + /** ObjID for DGCImpl */ + private static final ObjID dgcID = new ObjID(ObjID.DGC_ID); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2013-07-30 18:32:50.485585292 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2014-01-28 11:39:19.737589506 +0000 @@ -116,7 +116,7 @@ /* construct table mapping command strings to handlers */ private static Hashtable commandLookup; @@ -4713,8 +4732,8 @@ commandLookup.put(commands[i].getName(), commands[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2013-07-30 18:18:54.064413711 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2013-07-30 18:32:50.485585292 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-01-28 11:38:19.408649603 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-01-28 11:39:19.737589506 +0000 @@ -75,13 +75,13 @@ /** table of hosts successfully connected to and the factory used */ @@ -4740,25 +4759,9 @@ boolean setFactories = false; try { -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2013-07-30 18:32:50.489585355 +0100 -@@ -53,10 +53,10 @@ - /** stub for remote object */ - private final Remote stub; - /** set of clients that hold references to this target */ -- private final Vector refSet = new Vector<>(); -+ private final Vector refSet = new Vector(); - /** table that maps client endpoints to sequence numbers */ - private final Hashtable sequenceTable = -- new Hashtable<>(5); -+ new Hashtable(5); - /** access control context in which target was created */ - private final AccessControlContext acc; - /** context class loader in which target was created */ diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2013-07-30 18:32:50.489585355 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2014-01-28 11:39:19.737589506 +0000 @@ -85,7 +85,7 @@ private DataOutputStream dataOut; @@ -4769,8 +4772,8 @@ /** number of currently open connections */ private int numConnections = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2013-07-30 18:32:50.489585355 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2014-01-28 11:39:19.737589506 +0000 @@ -64,7 +64,7 @@ private final TCPTransport tr; /** list of cached connections */ @@ -4790,8 +4793,8 @@ /** thread ID counter */ private static int threadNum = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2013-07-30 18:18:54.036413270 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2013-07-30 18:32:50.489585355 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2014-01-28 11:38:19.380649167 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2014-01-28 11:39:19.737589506 +0000 @@ -148,7 +148,7 @@ // TBD: should this be a weak hash table? private static final @@ -4802,8 +4805,8 @@ /** * Create an endpoint for a specified host and port. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2013-07-30 18:32:50.493585418 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2014-01-28 11:39:19.737589506 +0000 @@ -120,7 +120,7 @@ /** client host for the current thread's connection */ @@ -4822,21 +4825,9 @@ static final RMISocketFactory defaultSocketFactory = RMISocketFactory.getDefaultSocketFactory(); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2013-07-30 18:32:50.493585418 +0100 -@@ -62,7 +62,7 @@ - Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel); - - /** References the current transport when a call is being serviced */ -- private static final ThreadLocal currentTransport = new ThreadLocal<>(); -+ private static final ThreadLocal currentTransport = new ThreadLocal(); - - /** ObjID for DGCImpl */ - private static final ObjID dgcID = new ObjID(ObjID.DGC_ID); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2013-07-30 18:32:50.493585418 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2014-01-28 11:39:19.737589506 +0000 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -4847,8 +4838,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2013-07-30 18:32:50.497585481 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2014-01-28 11:39:19.737589506 +0000 @@ -41,15 +41,15 @@ // or principal. // @@ -4889,8 +4880,8 @@ while (e1.hasMoreElements()) v.addElement(e1.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2013-07-30 18:32:50.497585481 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2014-01-28 11:39:19.737589506 +0000 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -4910,8 +4901,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2013-07-30 18:32:50.497585481 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2014-01-28 11:39:19.737589506 +0000 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -4949,8 +4940,8 @@ ids.add(new ServiceId(type, alg)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2013-07-30 18:32:50.497585481 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2014-01-28 11:39:19.737589506 +0000 @@ -40,7 +40,7 @@ public class Providers { @@ -4961,8 +4952,8 @@ // number of threads currently using thread-local provider lists // tracked to allow an optimization if == 0 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2013-07-30 18:32:50.501585544 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2014-01-28 11:39:19.737589506 +0000 @@ -267,7 +267,7 @@ if (ktabs.isEmpty()) { return kk.toArray(new KerberosKey[kk.size()]); @@ -4973,8 +4964,8 @@ 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2013-07-30 18:32:50.501585544 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2014-01-28 11:39:19.737589506 +0000 @@ -576,7 +576,7 @@ } }))); @@ -5051,9 +5042,74 @@ int type; for (int i = 0; i < len; i++) { type = getType(st.nextToken()); +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2014-01-28 11:39:19.741589569 +0000 +@@ -466,7 +466,7 @@ + */ + static class KdcAccessibility { + // Known bad KDCs +- private static Set bads = new HashSet<>(); ++ private static Set bads = new HashSet(); + + private static synchronized void addBad(String kdc) { + if (DEBUG) { +@@ -496,9 +496,9 @@ + // Returns a preferred KDC list by putting the bad ones at the end + private static synchronized String[] list(String kdcList) { + StringTokenizer st = new StringTokenizer(kdcList); +- List list = new ArrayList<>(); ++ List list = new ArrayList(); + if (badPolicy == BpType.TRY_LAST) { +- List badkdcs = new ArrayList<>(); ++ List badkdcs = new ArrayList(); + while (st.hasMoreTokens()) { + String t = st.nextToken(); + if (bads.contains(t)) badkdcs.add(t); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2014-01-28 11:39:19.741589569 +0000 +@@ -238,7 +238,7 @@ + if (subDer.getTag() != DerValue.tag_SequenceOf) { + throw new Asn1Exception(Krb5.ASN1_BAD_ID); + } +- Vector v = new Vector<>(); ++ Vector v = new Vector(); + DerValue subSubDer; + while(subDer.getData().available() > 0) { + subSubDer = subDer.getData().getDerValue(); +@@ -293,7 +293,7 @@ + // Code repetition, realm parsed again by class Realm + protected static String[] parseName(String name) { + +- Vector tempStrings = new Vector<>(); ++ Vector tempStrings = new Vector(); + String temp = name; + int i = 0; + int componentStart = 0; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2014-01-28 11:39:19.741589569 +0000 +@@ -359,14 +359,14 @@ + } + + String tempTarget = null, tempRealm = null; +- Stack iStack = new Stack<>(); ++ Stack iStack = new Stack(); + + /* + * The half-established reversed-path, starting from the final target + * (sRealm), each item can be connected to by the next one. + * Might contains wrong item, if found, a bad track is performed + */ +- Vector tempList = new Vector<>(8, 8); ++ Vector tempList = new Vector(8, 8); + tempList.add(sRealm); + + int count = 0; // For debug only 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2013-07-30 18:32:50.501585544 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2014-01-28 11:39:19.737589506 +0000 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5064,8 +5120,8 @@ temp.putInteger(BigInteger.valueOf(authenticator_vno)); v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2013-07-30 18:32:50.505585607 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2014-01-28 11:39:19.737589506 +0000 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5075,33 +5131,9 @@ if (der.getTag() != DerValue.tag_Sequence) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-07-30 18:32:50.505585607 +0100 -@@ -498,7 +498,7 @@ - - private static String exec(String c) { - StringTokenizer st = new StringTokenizer(c); -- Vector v = new Vector<>(); -+ Vector v = new Vector(); - while (st.hasMoreTokens()) { - v.addElement(st.nextToken()); - } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2013-07-30 18:32:50.505585607 +0100 -@@ -257,7 +257,7 @@ - + configName); - } - -- List list = new ArrayList<>(answer.length); -+ List list = new ArrayList(answer.length); - for (int i = 0; i < answer.length; i++) { - if (EncryptionKey.findKey(answer[i], keys) != null) { - list.add(answer[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2013-07-30 18:32:50.509585670 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2014-01-28 11:39:19.737589506 +0000 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5112,8 +5144,8 @@ v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), ctime.asn1Encode())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2013-07-30 18:32:50.509585670 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2014-01-28 11:39:19.737589506 +0000 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -5132,9 +5164,21 @@ for (int i = 0; i < addresses.length; i++) { try { +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2014-01-28 11:39:19.737589506 +0000 +@@ -150,7 +150,7 @@ + if (subsubDer.getTag() != DerValue.tag_SequenceOf) { + throw new Asn1Exception(Krb5.ASN1_BAD_ID); + } +- Vector v = new Vector<>(); ++ Vector v = new Vector(); + while (subsubDer.getData().available() > 0) { + v.addElement(new PAData(subsubDer.getData().getDerValue())); + } 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2013-07-30 18:32:50.509585670 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2014-01-28 11:39:19.737589506 +0000 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -5162,33 +5206,9 @@ v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), kdcOptions.asn1Encode())); if (msgType == Krb5.KRB_AS_REQ) { if (cname != null) { -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2013-07-30 18:32:50.509585670 +0100 -@@ -150,7 +150,7 @@ - if (subsubDer.getTag() != DerValue.tag_SequenceOf) { - throw new Asn1Exception(Krb5.ASN1_BAD_ID); - } -- Vector v = new Vector<>(); -+ Vector v = new Vector(); - while (subsubDer.getData().available() > 0) { - v.addElement(new PAData(subsubDer.getData().getDerValue())); - } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2013-07-30 18:32:50.513585733 +0100 -@@ -157,7 +157,7 @@ - * @exception IOException if an I/O error occurs while reading encoded data. - */ - public byte[] asn1Encode() throws Asn1Exception, IOException { -- Vector v = new Vector<>(); -+ Vector v = new Vector(); - v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), key.asn1Encode())); - if (prealm != null) - v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), prealm.asn1Encode())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2013-07-30 18:32:50.513585733 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2014-01-28 11:39:19.737589506 +0000 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -5199,8 +5219,8 @@ v.addElement(new Ticket(subsubDer.getData().getDerValue())); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2013-07-30 18:32:50.513585733 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2014-01-28 11:39:19.737589506 +0000 @@ -259,7 +259,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -5210,9 +5230,57 @@ while (derPA.data.available() > 0) { // read the PA-DATA DerValue tmp = derPA.data.getDerValue(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2014-01-28 11:39:19.737589506 +0000 +@@ -157,7 +157,7 @@ + * @exception IOException if an I/O error occurs while reading encoded data. + */ + public byte[] asn1Encode() throws Asn1Exception, IOException { +- Vector v = new Vector<>(); ++ Vector v = new Vector(); + v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), key.asn1Encode())); + if (prealm != null) + v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), prealm.asn1Encode())); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2014-01-28 11:39:19.741589569 +0000 +@@ -77,7 +77,7 @@ + */ + + public LastReq(DerValue encoding) throws Asn1Exception, IOException { +- Vector v= new Vector<>(); ++ Vector v= new Vector(); + if (encoding.getTag() != DerValue.tag_Sequence) { + throw new Asn1Exception(Krb5.ASN1_BAD_ID); + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-01-28 11:39:19.737589506 +0000 +@@ -542,7 +542,7 @@ + + private static String exec(String c) { + StringTokenizer st = new StringTokenizer(c); +- Vector v = new Vector<>(); ++ Vector v = new Vector(); + while (st.hasMoreTokens()) { + v.addElement(st.nextToken()); + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2014-01-28 11:39:19.737589506 +0000 +@@ -257,7 +257,7 @@ + + configName); + } + +- List list = new ArrayList<>(answer.length); ++ List list = new ArrayList(answer.length); + for (int i = 0; i < answer.length; i++) { + if (EncryptionKey.findKey(answer[i], keys) != null) { + list.add(answer[i]); 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 2013-07-30 18:18:54.064413711 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-07-30 18:33:26.610154787 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-01-28 11:38:19.408649603 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-01-28 11:39:19.737589506 +0000 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -5249,98 +5317,9 @@ for (int i = entries.size()-1; i >= 0; i--) { KeyTabEntry e = entries.get(i); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2013-07-30 18:32:50.517585796 +0100 -@@ -77,7 +77,7 @@ - */ - - public LastReq(DerValue encoding) throws Asn1Exception, IOException { -- Vector v= new Vector<>(); -+ Vector v= new Vector(); - if (encoding.getTag() != DerValue.tag_Sequence) { - throw new Asn1Exception(Krb5.ASN1_BAD_ID); - } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-07-30 18:32:50.521585860 +0100 -@@ -462,7 +462,7 @@ - */ - static class KdcAccessibility { - // Known bad KDCs -- private static Set bads = new HashSet<>(); -+ private static Set bads = new HashSet(); - - private static synchronized void addBad(String kdc) { - if (DEBUG) { -@@ -492,9 +492,9 @@ - // Returns a preferred KDC list by putting the bad ones at the end - private static synchronized String[] list(String kdcList) { - StringTokenizer st = new StringTokenizer(kdcList); -- List list = new ArrayList<>(); -+ List list = new ArrayList(); - if (badPolicy == BpType.TRY_LAST) { -- List badkdcs = new ArrayList<>(); -+ List badkdcs = new ArrayList(); - while (st.hasMoreTokens()) { - String t = st.nextToken(); - if (bads.contains(t)) badkdcs.add(t); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2013-07-30 18:32:50.521585860 +0100 -@@ -238,7 +238,7 @@ - if (subDer.getTag() != DerValue.tag_SequenceOf) { - throw new Asn1Exception(Krb5.ASN1_BAD_ID); - } -- Vector v = new Vector<>(); -+ Vector v = new Vector(); - DerValue subSubDer; - while(subDer.getData().available() > 0) { - subSubDer = subDer.getData().getDerValue(); -@@ -293,7 +293,7 @@ - // Code repetition, realm parsed again by class Realm - protected static String[] parseName(String name) { - -- Vector tempStrings = new Vector<>(); -+ Vector tempStrings = new Vector(); - String temp = name; - int i = 0; - int componentStart = 0; -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2013-07-30 18:32:50.521585860 +0100 -@@ -359,14 +359,14 @@ - } - - String tempTarget = null, tempRealm = null; -- Stack iStack = new Stack<>(); -+ Stack iStack = new Stack(); - - /* - * The half-established reversed-path, starting from the final target - * (sRealm), each item can be connected to by the next one. - * Might contains wrong item, if found, a bad track is performed - */ -- Vector tempList = new Vector<>(8, 8); -+ Vector tempList = new Vector(8, 8); - 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2013-07-30 18:32:50.525585923 +0100 -@@ -584,7 +584,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 newTrustAnchors = new HashSet<>(trustAnchors); -+ Set newTrustAnchors = new HashSet(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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2013-07-30 18:32:50.525585923 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2014-01-28 11:39:19.741589569 +0000 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -5351,8 +5330,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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2013-07-30 18:32:50.525585923 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2014-01-28 11:39:19.741589569 +0000 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -5408,8 +5387,8 @@ while (i < certs.length) { signerCerts.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2013-07-30 18:32:50.529585986 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2014-01-28 11:39:19.741589569 +0000 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -5420,8 +5399,8 @@ AccessController.doPrivileged(new PutAllAction(this, map)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2013-07-30 18:32:50.529585986 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2014-01-28 11:39:19.741589569 +0000 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -5432,8 +5411,8 @@ SunRsaSignEntries.putEntries(map); AccessController.doPrivileged(new PutAllAction(this, map)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2013-07-30 18:32:50.529585986 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2014-01-28 11:39:19.741589569 +0000 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -5478,9 +5457,21 @@ } } catch (ParsingException e) { while (data != null) { +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2014-01-28 11:39:19.741589569 +0000 +@@ -584,7 +584,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 newTrustAnchors = new HashSet<>(trustAnchors); ++ Set newTrustAnchors = new HashSet(trustAnchors); + + if (prevKey != null) { + // Add the previous certificate as a trust anchor. 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2013-07-30 18:32:50.533586049 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-01-28 11:39:19.741589569 +0000 @@ -219,7 +219,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -5491,8 +5482,8 @@ /** * Set of blinding parameters for a given RSA key. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2013-07-30 18:32:50.533586049 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2014-01-28 11:39:19.741589569 +0000 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -5503,8 +5494,8 @@ AccessController.doPrivileged(new PutAllAction(this, map)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2013-07-30 18:32:50.533586049 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2014-01-28 11:39:19.741589569 +0000 @@ -393,7 +393,7 @@ // Map BulkCipher -> Boolean(available) @@ -5515,8 +5506,8 @@ // descriptive name including key size, e.g. AES/128 final String description; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-07-30 18:32:50.537586112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2014-01-28 11:39:19.741589569 +0000 @@ -659,7 +659,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -5545,8 +5536,8 @@ if (suite != CipherSuite.C_SCSV) { 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2013-07-30 18:32:50.537586112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2014-01-28 11:39:19.741589569 +0000 @@ -260,7 +260,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -5584,8 +5575,8 @@ private static void digestKey(MessageDigest md, SecretKey key) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-07-30 18:32:50.537586112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-01-28 11:38:19.384649230 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-01-28 11:39:19.741589569 +0000 @@ -569,7 +569,7 @@ activeProtocols = getActiveProtocols(); } @@ -5605,8 +5596,8 @@ boolean found = false; for (CipherSuite suite : enabledCipherSuites.collection()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2013-07-30 18:32:50.541586175 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2014-01-28 11:39:19.741589569 +0000 @@ -169,7 +169,7 @@ return name; } @@ -5626,8 +5617,8 @@ list.add(toString(format)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2013-07-30 18:32:50.541586175 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2014-01-28 11:39:19.741589569 +0000 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -5637,48 +5628,9 @@ for (int i = 0; i < names.length; i++ ) { ProtocolVersion version = ProtocolVersion.valueOf(names[i]); if (versions.contains(version) == false) { -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-07-30 18:32:50.541586175 +0100 -@@ -156,7 +156,7 @@ - static Collection - getSupportedAlgorithms(AlgorithmConstraints constraints) { - -- Collection supported = new ArrayList<>(); -+ Collection supported = new ArrayList(); - synchronized (priorityMap) { - for (SignatureAndHashAlgorithm sigAlg : priorityMap.values()) { - if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM && -@@ -173,7 +173,7 @@ - // Get supported algorithm collection from an untrusted collection - static Collection getSupportedAlgorithms( - Collection algorithms ) { -- Collection supported = new ArrayList<>(); -+ Collection supported = new ArrayList(); - for (SignatureAndHashAlgorithm sigAlg : algorithms) { - if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM) { - supported.add(sigAlg); -@@ -185,7 +185,7 @@ - - static String[] getAlgorithmNames( - Collection algorithms) { -- ArrayList algorithmNames = new ArrayList<>(); -+ ArrayList algorithmNames = new ArrayList(); - if (algorithms != null) { - for (SignatureAndHashAlgorithm sigAlg : algorithms) { - algorithmNames.add(sigAlg.algorithm); -@@ -198,7 +198,7 @@ - - static Set getHashAlgorithmNames( - Collection algorithms) { -- Set algorithmNames = new HashSet<>(); -+ Set algorithmNames = new HashSet(); - if (algorithms != null) { - for (SignatureAndHashAlgorithm sigAlg : algorithms) { - if (sigAlg.hash.value > 0) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2013-07-30 18:32:50.545586238 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2014-01-28 11:39:19.741589569 +0000 @@ -261,7 +261,7 @@ protected Set decomposes(KeyExchange keyExchange, @@ -5725,8 +5677,8 @@ if(cipherSuite.keyExchange != null) { components.addAll( diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2013-07-30 18:32:50.545586238 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2014-01-28 11:39:19.741589569 +0000 @@ -331,7 +331,7 @@ Collection allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -5755,8 +5707,8 @@ if ((certs != null) && (certs.length > 0)){ Collections.addAll(trustedCerts, certs); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-07-30 18:32:50.545586238 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2014-01-28 11:39:19.745589631 +0000 @@ -618,7 +618,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -5776,8 +5728,8 @@ Object securityCtx = SecureKey.getCurrentSecurityContext(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-07-30 18:32:50.549586301 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-01-28 11:39:19.745589631 +0000 @@ -2494,7 +2494,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -5787,9 +5739,48 @@ event = e; } +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-01-28 11:39:19.741589569 +0000 +@@ -156,7 +156,7 @@ + static Collection + getSupportedAlgorithms(AlgorithmConstraints constraints) { + +- Collection supported = new ArrayList<>(); ++ Collection supported = new ArrayList(); + synchronized (priorityMap) { + for (SignatureAndHashAlgorithm sigAlg : priorityMap.values()) { + if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM && +@@ -173,7 +173,7 @@ + // Get supported algorithm collection from an untrusted collection + static Collection getSupportedAlgorithms( + Collection algorithms ) { +- Collection supported = new ArrayList<>(); ++ Collection supported = new ArrayList(); + for (SignatureAndHashAlgorithm sigAlg : algorithms) { + if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM) { + supported.add(sigAlg); +@@ -185,7 +185,7 @@ + + static String[] getAlgorithmNames( + Collection algorithms) { +- ArrayList algorithmNames = new ArrayList<>(); ++ ArrayList algorithmNames = new ArrayList(); + if (algorithms != null) { + for (SignatureAndHashAlgorithm sigAlg : algorithms) { + algorithmNames.add(sigAlg.algorithm); +@@ -198,7 +198,7 @@ + + static Set getHashAlgorithmNames( + Collection algorithms) { +- Set algorithmNames = new HashSet<>(); ++ Set algorithmNames = new HashSet(); + if (algorithms != null) { + for (SignatureAndHashAlgorithm sigAlg : algorithms) { + if (sigAlg.hash.value > 0) { 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2013-07-30 18:32:50.549586301 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2014-01-28 11:39:19.745589631 +0000 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -5809,8 +5800,8 @@ Principal p = principals[i]; if (p instanceof X500Principal) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2013-07-30 18:32:50.549586301 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-01-28 11:39:19.745589631 +0000 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -5821,8 +5812,8 @@ KeyStore ks = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2013-07-30 18:32:50.549586301 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2014-01-28 11:39:19.745589631 +0000 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -5842,8 +5833,8 @@ return null; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-07-30 18:32:50.553586364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-01-28 11:39:19.745589631 +0000 @@ -123,14 +123,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -5861,7 +5852,7 @@ char[] keypass; // private key password String sigfile; // name of .SF file String sigalg; // name of signature algorithm -@@ -566,7 +566,7 @@ +@@ -568,7 +568,7 @@ try { jf = new JarFile(jarName, true); @@ -5870,7 +5861,7 @@ byte[] buffer = new byte[8192]; Enumeration entries = jf.entries(); -@@ -593,7 +593,7 @@ +@@ -595,7 +595,7 @@ // The map to record display info, only used when -verbose provided // key: signer info string // value: the list of files with common key @@ -5879,7 +5870,7 @@ if (man != null) { if (verbose != null) System.out.println(); -@@ -946,7 +946,7 @@ +@@ -977,7 +977,7 @@ .append(signTimeForm.format(source)).append("]").toString(); } @@ -5888,7 +5879,7 @@ private int inKeyStoreForOneSigner(CodeSigner signer) { if (cacheForInKS.containsKey(signer)) { -@@ -989,7 +989,7 @@ +@@ -1020,7 +1020,7 @@ return result; } @@ -5897,7 +5888,7 @@ int inKeyStore(CodeSigner[] signers) { -@@ -1119,7 +1119,7 @@ +@@ -1150,7 +1150,7 @@ * generated one. (This may invalidate existing signatures!) */ BASE64Encoder encoder = new JarBASE64Encoder(); @@ -5906,7 +5897,7 @@ boolean wasSigned = false; -@@ -1476,7 +1476,7 @@ +@@ -1534,7 +1534,7 @@ return false; } @@ -5915,7 +5906,7 @@ /** * Returns a string of singer info, with a newline at the end -@@ -1577,7 +1577,7 @@ +@@ -1636,7 +1636,7 @@ certificateFactory = CertificateFactory.getInstance("X.509"); validator = CertPathValidator.getInstance("PKIX"); @@ -5925,8 +5916,8 @@ KeyStore caks = KeyTool.getCacertsKeyStore(); if (caks != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-07-30 18:18:54.068413774 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-07-30 18:32:50.553586364 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-01-28 11:38:19.412649665 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-01-28 11:39:19.745589631 +0000 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -5997,8 +5988,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2013-07-30 18:32:50.557586427 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2014-01-28 11:39:19.745589631 +0000 @@ -643,7 +643,7 @@ Class pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -6036,8 +6027,8 @@ super(i, b); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-07-30 18:18:54.068413774 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-07-30 18:32:50.557586427 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-01-28 11:38:19.412649665 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-01-28 11:39:19.745589631 +0000 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -6047,9 +6038,71 @@ /** * Checks if a certificate is untrusted. +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2014-01-28 11:39:19.745589631 +0000 +@@ -352,7 +352,7 @@ + if (extensions == null) { + return null; + } +- Set extSet = new TreeSet<>(); ++ Set extSet = new TreeSet(); + for (Extension ex : extensions.getAllExtensions()) { + if (ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -373,7 +373,7 @@ + if (extensions == null) { + return null; + } +- Set extSet = new TreeSet<>(); ++ Set extSet = new TreeSet(); + for (Extension ex : extensions.getAllExtensions()) { + if (!ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -510,7 +510,7 @@ + return Collections.emptyMap(); + } + Collection exts = extensions.getAllExtensions(); +- Map map = new TreeMap<>(); ++ Map map = new TreeMap(); + for (Extension ext : exts) { + map.put(ext.getId(), ext); + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2014-01-28 11:39:19.745589631 +0000 +@@ -104,8 +104,8 @@ + private X500Principal issuerPrincipal = null; + private Date thisUpdate = null; + private Date nextUpdate = null; +- private Map revokedMap = new TreeMap<>(); +- private List revokedList = new LinkedList<>(); ++ private Map revokedMap = new TreeMap(); ++ private List revokedList = new LinkedList(); + private CRLExtensions extensions = null; + private final static boolean isExplicit = true; + private static final long YR_2050 = 2524636800000L; +@@ -907,7 +907,7 @@ + if (extensions == null) { + return null; + } +- Set extSet = new TreeSet<>(); ++ Set extSet = new TreeSet(); + for (Extension ex : extensions.getAllExtensions()) { + if (ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -928,7 +928,7 @@ + if (extensions == null) { + return null; + } +- Set extSet = new TreeSet<>(); ++ Set extSet = new TreeSet(); + for (Extension ex : extensions.getAllExtensions()) { + if (!ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2013-07-30 18:32:50.561586490 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2014-01-28 11:39:19.745589631 +0000 @@ -1253,7 +1253,7 @@ if (exts == null) { return null; @@ -6096,71 +6149,9 @@ nameEntryCopy.set(1, ((byte[])nameObject).clone()); namesCopy.add(Collections.unmodifiableList(nameEntryCopy)); } else { -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2013-07-30 18:32:50.565586553 +0100 -@@ -352,7 +352,7 @@ - if (extensions == null) { - return null; - } -- Set extSet = new TreeSet<>(); -+ Set extSet = new TreeSet(); - for (Extension ex : extensions.getAllExtensions()) { - if (ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -373,7 +373,7 @@ - if (extensions == null) { - return null; - } -- Set extSet = new TreeSet<>(); -+ Set extSet = new TreeSet(); - for (Extension ex : extensions.getAllExtensions()) { - if (!ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -510,7 +510,7 @@ - return Collections.emptyMap(); - } - Collection exts = extensions.getAllExtensions(); -- Map map = new TreeMap<>(); -+ Map map = new TreeMap(); - for (Extension ext : exts) { - map.put(ext.getId(), ext); - } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2013-07-30 18:32:50.565586553 +0100 -@@ -104,8 +104,8 @@ - private X500Principal issuerPrincipal = null; - private Date thisUpdate = null; - private Date nextUpdate = null; -- private Map revokedMap = new TreeMap<>(); -- private List revokedList = new LinkedList<>(); -+ private Map revokedMap = new TreeMap(); -+ private List revokedList = new LinkedList(); - private CRLExtensions extensions = null; - private final static boolean isExplicit = true; - private static final long YR_2050 = 2524636800000L; -@@ -907,7 +907,7 @@ - if (extensions == null) { - return null; - } -- Set extSet = new TreeSet<>(); -+ Set extSet = new TreeSet(); - for (Extension ex : extensions.getAllExtensions()) { - if (ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -928,7 +928,7 @@ - if (extensions == null) { - return null; - } -- Set extSet = new TreeSet<>(); -+ Set extSet = new TreeSet(); - for (Extension ex : extensions.getAllExtensions()) { - if (!ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2013-07-30 18:32:50.565586553 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2014-01-28 11:39:19.745589631 +0000 @@ -95,7 +95,7 @@ * Run the converter */ @@ -6170,9 +6161,30 @@ File outputFile = null; boolean createOutputFile = false; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2014-01-28 11:39:19.749589693 +0000 +@@ -59,7 +59,7 @@ + * set of provider implementations of a particular locale sensitive service. + */ + private static ConcurrentMap, LocaleServiceProviderPool> poolOfPools = +- new ConcurrentHashMap<>(); ++ new ConcurrentHashMap, LocaleServiceProviderPool>(); + + /** + * A Set containing locale service providers that implement the +@@ -264,7 +264,7 @@ + synchronized (LocaleServiceProviderPool.class) { + if (availableJRELocales == null) { + Locale[] allLocales = LocaleData.getAvailableLocales(); +- List tmpList = new ArrayList<>(allLocales.length); ++ List tmpList = new ArrayList(allLocales.length); + for (Locale locale : allLocales) { + tmpList.add(getLookupLocale(locale)); + } 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2013-07-30 18:32:50.565586553 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2014-01-28 11:39:19.749589693 +0000 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -6287,8 +6299,8 @@ ukeywords.put(key, type); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2013-07-30 18:32:50.569586617 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2014-01-28 11:39:19.749589693 +0000 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -6344,8 +6356,8 @@ extensions.add(locextKey.toString() + SEP + ext.getValue()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2013-07-30 18:32:50.569586617 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2014-01-28 11:39:19.749589693 +0000 @@ -81,7 +81,7 @@ } @@ -6373,8 +6385,8 @@ String key = LocaleUtils.toLowerString(kwd.getKey().value()); String type = LocaleUtils.toLowerString(kwd.getValue()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-07-30 18:32:50.569586617 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2014-01-28 11:39:19.749589693 +0000 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache { @@ -6410,30 +6422,9 @@ CacheEntry oldEntry = map.put(key, entry); return (oldEntry == null) ? null : oldEntry.get(); } -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2013-07-30 18:32:50.573586680 +0100 -@@ -59,7 +59,7 @@ - * set of provider implementations of a particular locale sensitive service. - */ - private static ConcurrentMap, LocaleServiceProviderPool> poolOfPools = -- new ConcurrentHashMap<>(); -+ new ConcurrentHashMap, LocaleServiceProviderPool>(); - - /** - * A Set containing locale service providers that implement the -@@ -264,7 +264,7 @@ - synchronized (LocaleServiceProviderPool.class) { - if (availableJRELocales == null) { - Locale[] allLocales = LocaleData.getAvailableLocales(); -- List tmpList = new ArrayList<>(allLocales.length); -+ List tmpList = new ArrayList(allLocales.length); - for (Locale locale : allLocales) { - tmpList.add(getLookupLocale(locale)); - } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2013-07-30 18:32:50.577586743 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2014-01-28 11:39:19.749589693 +0000 @@ -187,7 +187,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -6453,8 +6444,8 @@ return log; } diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2013-07-30 18:32:50.577586743 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2014-01-28 11:39:19.749589693 +0000 @@ -160,7 +160,7 @@ } @@ -6489,8 +6480,8 @@ openwrite.add(WRITE); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2013-07-30 18:32:50.577586743 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2014-01-28 11:39:19.749589693 +0000 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -6503,8 +6494,8 @@ private CharsetDecoder decoder() { CharsetDecoder dec = decTL.get(); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2013-07-30 18:32:50.581586806 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2014-01-28 11:39:19.749589693 +0000 @@ -134,7 +134,7 @@ throws IOException { @@ -6515,8 +6506,8 @@ for (AttrID id : AttrID.values()) { try { diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2013-07-30 18:32:50.589586932 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2014-01-28 11:39:19.749589693 +0000 @@ -157,7 +157,7 @@ @Override @@ -6617,8 +6608,8 @@ inodes.put(root, root); dirs.add(root); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2013-07-30 18:32:50.589586932 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2014-01-28 11:39:19.749589693 +0000 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -6629,8 +6620,8 @@ public ZipFileSystemProvider() {} diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2013-07-30 18:32:50.589586932 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2014-01-28 11:39:19.749589693 +0000 @@ -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. @@ -6641,8 +6632,8 @@ // so that earlier variables override later ones. for (int i = environ.length-1; i > 0; i-=2) diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-07-30 18:18:54.068413774 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-07-30 18:32:50.593586995 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-01-28 11:38:19.412649665 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-01-28 11:39:19.749589693 +0000 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -6707,8 +6698,8 @@ } if (!changeLog.isEmpty()) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-07-30 18:32:50.593586995 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-01-28 11:39:19.749589693 +0000 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -6728,8 +6719,8 @@ if (domain != null && domain.length() > 0) { sl.add(domain); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2013-07-30 18:32:50.593586995 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2014-01-28 11:39:19.749589693 +0000 @@ -43,10 +43,10 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController { @@ -6744,9 +6735,9 @@ private static final JarFileFactory instance = new JarFileFactory(); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-07-30 18:32:50.597587058 +0100 -@@ -130,7 +130,7 @@ +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-01-28 11:39:19.749589693 +0000 +@@ -133,7 +133,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); if (OPEN_MAX > MAX_UPDATE_ARRAY_SIZE) @@ -6756,9 +6747,9 @@ void initInterrupt(int fd0, int fd1) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2013-07-12 16:55:20.190385578 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2013-07-12 16:55:49.650853135 +0100 -@@ -134,7 +134,7 @@ +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-01-28 11:39:19.749589693 +0000 +@@ -136,7 +136,7 @@ // eventHigh needed when using file descriptors > 64k if (OPEN_MAX > MAX_UPDATE_ARRAY_SIZE) @@ -6768,8 +6759,8 @@ void initInterrupt(int fd0, int fd1) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2013-07-12 16:54:39.869745670 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2013-07-12 16:55:06.426167135 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2014-01-28 11:39:19.749589693 +0000 @@ -67,7 +67,7 @@ fd1 = (int) pipeFds; pollWrapper = new EPollArrayWrapper(); @@ -6780,8 +6771,8 @@ protected int doSelect(long timeout) throws IOException { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2013-07-30 18:32:50.625587499 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2014-01-28 11:39:19.749589693 +0000 @@ -113,7 +113,7 @@ SocketAddress[] saa) { @@ -6792,8 +6783,8 @@ set.add(getRevealedLocalAddress(sa, sm)); } diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2013-07-30 18:32:50.597587058 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2014-01-28 11:39:19.749589693 +0000 @@ -153,12 +153,12 @@ static { @@ -6812,8 +6803,8 @@ if (!(isEncodingSupported("US-ASCII") && isEncodingSupported("ISO-8859-1"))) diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2013-07-30 18:32:50.597587058 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2014-01-28 11:39:19.749589693 +0000 @@ -53,7 +53,7 @@ static final Set supportedFileAttributeViews = supportedFileAttributeViews(); @@ -6833,8 +6824,8 @@ long fp = setmntent(fstab.getBytes(), "r".getBytes()); try { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2013-07-30 18:32:50.601587122 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2014-01-28 11:39:19.749589693 +0000 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -6845,8 +6836,8 @@ int pos = 0; while (pos < size) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2013-07-30 18:32:50.601587122 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2014-01-28 11:39:19.749589693 +0000 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -6857,8 +6848,8 @@ long offset = address + i*SIZEOF_ACE_T; diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2013-07-30 18:32:50.601587122 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2014-01-28 11:39:19.749589693 +0000 @@ -76,7 +76,7 @@ static final Set supportedFileAttributeViews = supportedFileAttributeViews(); @@ -6878,8 +6869,8 @@ UnixPath mnttab = new UnixPath(this, "/etc/mnttab"); long fp = fopen(mnttab, "r"); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2013-07-30 18:32:50.605587184 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2014-01-28 11:39:19.749589693 +0000 @@ -83,7 +83,7 @@ } @@ -6890,8 +6881,8 @@ byte[] name; while ((name = readdir(dp)) != null) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2013-07-30 18:32:50.605587184 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2014-01-28 11:39:19.749589693 +0000 @@ -194,7 +194,7 @@ @Override public Set permissions() { @@ -6902,8 +6893,8 @@ if ((bits & UnixConstants.S_IRUSR) > 0) perms.add(PosixFilePermission.OWNER_READ); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java ---- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2013-07-30 18:32:50.605587184 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2014-01-28 11:39:19.753589755 +0000 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -6925,8 +6916,8 @@ StringBuilder sb = new StringBuilder(size()*30); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-07-30 18:32:50.605587184 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-01-28 11:39:19.753589755 +0000 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -6937,8 +6928,8 @@ // comma and space are valid delimites StringTokenizer st = new StringTokenizer(str, ", "); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2013-07-30 18:32:50.609587247 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2014-01-28 11:39:19.753589755 +0000 @@ -128,7 +128,7 @@ } @@ -6949,8 +6940,8 @@ for (int i = 0; i <= 25; i++) { // 0->A, 1->B, 2->C... if ((drives & (1 << i)) != 0) { diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2013-07-30 18:32:50.609587247 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2014-01-28 11:39:19.753589755 +0000 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -6961,8 +6952,8 @@ // empty path considered to have one name element list.add(0); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2013-07-30 18:32:50.609587247 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2014-01-28 11:39:19.753589755 +0000 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -6973,8 +6964,8 @@ // decode each of the ACEs to AclEntry objects for (int i=0; i snippets = new HashMap<>(); -+ private final Map snippets = new HashMap(); - - 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2013-07-30 18:32:50.617587373 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2014-01-28 11:39:19.753589755 +0000 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -7056,9 +7035,21 @@ public int stackSize(int currentSize) { return currentSize + 1; +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2014-01-28 11:39:19.753589755 +0000 +@@ -50,7 +50,7 @@ + private final Injector[] after = new Injector[256]; + private final String className; + private final String methodName; +- private final Map snippets = new HashMap<>(); ++ private final Map snippets = new HashMap(); + + private int pos; + private int newPos; 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2013-07-30 18:32:50.617587373 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2014-01-28 11:39:19.753589755 +0000 @@ -103,7 +103,7 @@ } } @@ -7068,9 +7059,21 @@ private static void check(Type t, String what) { if (t == null || !checking.add(t)) +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 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2014-01-28 11:39:19.753589755 +0000 +@@ -59,7 +59,7 @@ + } + } + final int threadCount = 2; +- List collectors = new ArrayList<>(); ++ List collectors = new ArrayList(); + List threads = new ArrayList(); + for (int i = 0; i < threadCount; i++) { + RandomCollector r = new RandomCollector(); 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2013-07-30 18:32:50.617587373 +0100 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2014-01-23 23:19:20.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2014-01-28 11:39:19.753589755 +0000 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -7080,15 +7083,3 @@ 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 2013-07-24 21:32:02.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2013-07-30 18:32:50.621587436 +0100 -@@ -59,7 +59,7 @@ - } - } - final int threadCount = 2; -- List collectors = new ArrayList<>(); -+ List collectors = new ArrayList(); - List threads = new ArrayList(); - for (int i = 0; i < threadCount; i++) { - RandomCollector r = new RandomCollector();