Mercurial > hg > release > icedtea7-2.2
changeset 2578:39a069b2d432
Bring in latest security fixes and associated backports.
2013-02-13 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am,
(HOTSPOT_CHANGESET): Update to IcedTea7 2.2 forest head;
the tag icedtea-2.2.5.
(CORBA_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* patches/boot/ecj-diamond.patch:
Regenerated and new cases added.
* patches/boot/ecj-multicatch.patch:
New case added.
* patches/boot/ecj-trywithresources.patch:
Regenerated.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 13 Feb 2013 16:13:30 +0000 |
| parents | bd981b9485ed |
| children | bb62d64bd4ea |
| files | ChangeLog Makefile.am NEWS patches/boot/ecj-diamond.patch patches/boot/ecj-multicatch.patch patches/boot/ecj-trywithresources.patch |
| diffstat | 6 files changed, 842 insertions(+), 734 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jan 16 01:26:58 2013 +0000 +++ b/ChangeLog Wed Feb 13 16:13:30 2013 +0000 @@ -1,3 +1,29 @@ +2013-02-13 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am, + (HOTSPOT_CHANGESET): Update to IcedTea7 2.2 forest head; + the tag icedtea-2.2.5. + (CORBA_CHANGESET): Likewise. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * patches/boot/ecj-diamond.patch: + Regenerated and new cases added. + * patches/boot/ecj-multicatch.patch: + New case added. + * patches/boot/ecj-trywithresources.patch: + Regenerated. + * NEWS: Updated. + 2013-01-16 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: Add 2.2.5 section.
--- a/Makefile.am Wed Jan 16 01:26:58 2013 +0000 +++ b/Makefile.am Wed Feb 13 16:13:30 2013 +0000 @@ -4,21 +4,21 @@ JDK_UPDATE_VERSION = 05 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = f90e1b6ccfb6 -HOTSPOT_CHANGESET = 60d6e32e00a6 -JAXP_CHANGESET = 028a292be666 -JAXWS_CHANGESET = c620184ea425 -JDK_CHANGESET = 8fccb53fef83 -LANGTOOLS_CHANGESET = 206668cf21e5 -OPENJDK_CHANGESET = 431257be5014 +HOTSPOT_CHANGESET = d2e4bf94d38d +CORBA_CHANGESET = 5a9a1b4aecd3 +JAXP_CHANGESET = 7d285e628870 +JAXWS_CHANGESET = acf0bd2643a5 +JDK_CHANGESET = 59849a48553a +LANGTOOLS_CHANGESET = de74a816c73a +OPENJDK_CHANGESET = ac5792f240c0 -CORBA_SHA256SUM = 1480c0ae07c31a5a0c70791a5ac8576ebd4a606fbf7e97d901ffce98a121c5ba -HOTSPOT_SHA256SUM = 8c22bcae21996ad394a00c8607f716f5b9156f0f8005f2558adda58cbcd48275 -JAXP_SHA256SUM = 578b309af7bca3290e1df62c3950701196b791579ecd97f93da3b8fee17fc689 -JAXWS_SHA256SUM = 33c1f30d67ef2bc290f53f852f5d02ea6815f7ef875140306fabfec15e57a816 -JDK_SHA256SUM = a3e05956d2979ac5a5ea1331857a9b04b9f31a1283dda2ec746435cd4fd551b9 -LANGTOOLS_SHA256SUM = d5a8460788cc1cb6af9bfd9d70c01811a60c2a27e31ce5331d4bf444bc1f5a17 -OPENJDK_SHA256SUM = 6fe4d91049da673a843ff2b41ec9e9601c9ff45ba37526d414b8f0a700fa33d5 +HOTSPOT_SHA256SUM = 0023b69aa7e7b6c821b0d49bc28c56cf4cc5651f7e8816cb9b841f306ad14a7e +CORBA_SHA256SUM = d093c8317798b47462022c0944da1146677c58f687e599475103ce65292ac0bc +JAXP_SHA256SUM = 89456507df28350f22f3809744b5997164a2e7576d63e9a7472dab37700c8e19 +JAXWS_SHA256SUM = 24044a7f4bdc2368026aaefc7b25f2fc5c6a2b4145a8af7dc9393252dee5e238 +JDK_SHA256SUM = b0a1193a299a0d03cb040cdb538fcefb43bc72e9f61e5b209441931f58c1f351 +LANGTOOLS_SHA256SUM = b96dff5fe7a5a7fa90a73aacd9d67e70ee3598e7ea904e09a841d2e56fb86d9e +OPENJDK_SHA256SUM = 47c661b2bda7167184d91bf7d7010f4ccf94a6b75298961da40c0eefe40fef53 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
--- a/NEWS Wed Jan 16 01:26:58 2013 +0000 +++ b/NEWS Wed Feb 13 16:13:30 2013 +0000 @@ -12,6 +12,48 @@ New in release 2.2.5 (2013-XX-XX): +* Security fixes + - S6563318, CVE-2013-0424: RMI data sanitization + - S6664509, CVE-2013-0425: Add logging context + - S6664528, CVE-2013-0426: Find log level matching its name or value given at construction time + - S6776941: CVE-2013-0427: Improve thread pool shutdown + - S7141694, CVE-2013-0429: Improving CORBA internals + - S7173145: Improve in-memory representation of splashscreens + - S7186945: Unpack200 improvement + - S7186946: Refine unpacker resource usage + - S7186948: Improve Swing data validation + - S7186952, CVE-2013-0432: Improve clipboard access + - S7186954: Improve connection performance + - S7186957: Improve Pack200 data validation + - S7192392, CVE-2013-0443: Better validation of client keys + - S7192393, CVE-2013-0440: Better Checking of order of TLS Messages + - S7192977, CVE-2013-0442: Issue in toolkit thread + - S7197546, CVE-2013-0428: (proxy) Reflect about creating reflective proxies + - S7200491: Tighten up JTable layout code + - S7200493, CVE-2013-0444: Improve cache handling + - S7200499: Better data validation for options + - S7200500: Launcher better input validation + - S7201064: Better dialogue checking + - S7201066, CVE-2013-0441: Change modifiers on unused fields + - S7201068, CVE-2013-0435: Better handling of UI elements + - S7201070: Serialization to conform to protocol + - S7201071, CVE-2013-0433: InetSocketAddress serialization issue + - S8000210: Improve JarFile code quality + - S8000537, CVE-2013-0450: Contextualize RequiredModelMBean class + - S8000539, CVE-2013-0431: Introspect JMX data handling + - S8000540, CVE-2013-1475: Improve IIOP type reuse management + - S8000631, CVE-2013-1476: Restrict access to class constructor + - S8001235, CVE-2013-0434: Improve JAXP HTTP handling + - S8001242: Improve RMI HTTP conformance + - S8001307: Modify ACC_SUPER behavior + - S8001972, CVE-2013-1478: Improve image processing + - S8002325, CVE-2013-1480: Improve management of images +* Backports + - S7175616: Port fix for TimeZone from JDK 8 to JDK 7 + - S8002068: Build broken: corba code changes unable to use new JDK 7 classes + - S8004341: Two JCK tests fails with 7u11 b06 + - S8005615: Java Logger fails to load tomcat logger implementation (JULI) + New in release 2.2.4 (2013-01-15): * Security fixes
--- a/patches/boot/ecj-diamond.patch Wed Jan 16 01:26:58 2013 +0000 +++ b/patches/boot/ecj-diamond.patch Wed Feb 13 16:13:30 2013 +0000 @@ -1,6 +1,41 @@ +diff -Nru openjdk-boot.orig/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java openjdk-boot/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java +--- openjdk-boot.orig/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java 2013-02-13 14:58:21.597631649 +0000 ++++ openjdk-boot/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java 2013-02-13 14:58:36.141865381 +0000 +@@ -68,10 +68,10 @@ + // JVM info properties + private File runtime = null; + private String mainClassName = null; +- private ArrayList<File> classPath = new ArrayList<>(); +- private ArrayList<File> nativeLibraries = new ArrayList<>(); +- private ArrayList<String> options = new ArrayList<>(); +- private ArrayList<String> arguments = new ArrayList<>(); ++ private ArrayList<File> classPath = new ArrayList<File>(); ++ private ArrayList<File> nativeLibraries = new ArrayList<File>(); ++ private ArrayList<String> options = new ArrayList<String>(); ++ private ArrayList<String> arguments = new ArrayList<String>(); + + public static final String EXECUTABLE_NAME = "JavaAppLauncher"; + public static final String DEFAULT_ICON_NAME = "GenericApp.icns"; +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-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-02-13 14:50:35.658144443 +0000 +@@ -62,9 +62,10 @@ + */ + public final class DocumentHandler extends DefaultHandler { + private final AccessControlContext acc = AccessController.getContext(); +- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>(); +- private final Map<String, Object> environment = new HashMap<>(); +- private final List<Object> objects = new ArrayList<>(); ++ private final Map<String, Class<? extends ElementHandler>> handlers = ++ new HashMap<String, Class<? extends ElementHandler>>(); ++ private final Map<String, Object> environment = new HashMap<String, Object>(); ++ private final List<Object> objects = new ArrayList<Object>(); + + private Reference<ClassLoader> 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-05-23 18:44:10.516396787 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-13 14:50:35.550142708 +0000 @@ -103,9 +103,9 @@ return this.def.compareTo(that.def); } @@ -72,8 +107,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 2012-05-23 18:42:49.223062740 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-13 14:50:01.085588951 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-13 14:50:35.554142772 +0000 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -83,7 +118,7 @@ for (int i = 0; i < basicCodings.length; i++) { Coding c = basicCodings[i]; if (c == null) continue; -@@ -1068,8 +1068,8 @@ +@@ -1067,8 +1067,8 @@ // Bootstrap support for CPRefBands. These are needed to record // intended CP indexes, before the CP has been created. @@ -94,7 +129,7 @@ int encodeRef(Entry e, Index ix) { -@@ -1704,7 +1704,7 @@ +@@ -1705,7 +1705,7 @@ protected int attrClassFileVersionMask; // Mapping from Attribute.Layout to Band[] (layout element bands). @@ -103,7 +138,7 @@ // Well-known attributes: protected final Attribute.Layout attrCodeEmpty; -@@ -1713,16 +1713,16 @@ +@@ -1714,16 +1714,16 @@ protected final Attribute.Layout attrConstantValue; // Mapping from Attribute.Layout to Integer (inverse of attrDefs) @@ -123,7 +158,7 @@ attrIndexLimit[i], (Attribute.Layout)null))); } -@@ -1912,7 +1912,7 @@ +@@ -1913,7 +1913,7 @@ protected List<Attribute.Layout> getPredefinedAttrs(int ctype) { assert(attrIndexLimit[ctype] != 0); @@ -132,7 +167,7 @@ // Remove nulls and non-predefs. for (int ai = 0; ai < attrIndexLimit[ctype]; ai++) { if (testBit(attrDefSeen[ctype], 1L<<ai)) continue; -@@ -2536,7 +2536,7 @@ +@@ -2537,7 +2537,7 @@ // DEBUG ONLY: Record something about the band order. boolean notePrevForAssert(Band b, Band p) { if (prevForAssertMap == null) @@ -142,8 +177,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 2012-05-23 18:42:49.079060377 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-13 14:50:00.953586831 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-13 14:50:35.554142772 +0000 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -154,8 +189,8 @@ InnerClass ic = new InnerClass(readClassRef(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-13 14:50:35.554142772 +0000 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -192,8 +227,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-13 14:50:35.554142772 +0000 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -204,8 +239,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-13 14:50:35.554142772 +0000 @@ -915,7 +915,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -224,7 +259,7 @@ } part.add(cpMap[i]); } -@@ -1133,7 +1133,7 @@ +@@ -1135,7 +1135,7 @@ void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) { cpRefs.remove(null); for (ListIterator<Entry> work = @@ -234,9 +269,9 @@ 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 2012-05-23 18:42:49.223062740 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-23 18:44:10.552397378 +0100 -@@ -59,7 +59,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-13 14:50:01.085588951 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-13 14:50:35.554142772 +0000 +@@ -60,7 +60,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); public static void main(String[] ava) throws IOException { @@ -245,7 +280,7 @@ boolean doPack = true; boolean doUnpack = false; -@@ -82,7 +82,7 @@ +@@ -83,7 +83,7 @@ } // Collect engine properties here: @@ -254,7 +289,7 @@ engProps.put(verboseProp, System.getProperty(verboseProp)); String optionMap; -@@ -96,7 +96,7 @@ +@@ -97,7 +97,7 @@ } // Collect argument properties here: @@ -263,7 +298,7 @@ try { for (;;) { String state = parseCommandOptions(av, optionMap, avProps); -@@ -530,7 +530,7 @@ +@@ -529,7 +529,7 @@ String resultString = null; // Convert options string into optLines dictionary. @@ -273,8 +308,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-13 14:50:35.554142772 +0000 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -285,8 +320,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/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-13 14:50:35.554142772 +0000 @@ -126,11 +126,11 @@ public void setBytes(byte[] newBytes) { if (bytes == newBytes) return; @@ -311,8 +346,8 @@ static final int LOC_SHIFT = 1; 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 2012-05-23 18:42:49.079060377 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-13 14:50:00.953586831 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-13 14:50:35.554142772 +0000 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -477,8 +512,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 2012-05-23 18:42:49.223062740 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-13 14:50:01.085588951 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-13 14:50:35.554142772 +0000 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -592,8 +627,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 2012-05-23 18:42:49.223062740 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-05-23 18:44:10.552397378 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-13 14:50:01.085588951 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-13 14:50:35.562142900 +0000 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -649,8 +684,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-13 14:50:35.562142900 +0000 @@ -181,8 +181,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -681,8 +716,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-13 14:50:35.562142900 +0000 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -693,8 +728,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 2012-05-23 18:42:49.223062740 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-13 14:50:01.085588951 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-13 14:50:35.562142900 +0000 @@ -47,8 +47,8 @@ */ @@ -716,8 +751,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-13 14:50:35.562142900 +0000 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -738,8 +773,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 2012-05-23 18:42:49.227062806 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-13 14:50:01.085588951 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-13 14:50:35.562142900 +0000 @@ -232,7 +232,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -750,8 +785,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 2012-05-23 18:42:49.227062806 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-13 14:50:01.085588951 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-13 14:50:35.562142900 +0000 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -762,8 +797,8 @@ // convenience methods to access the TL globals static TLGlobals getTLGlobals() { 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-13 14:50:35.566142965 +0000 @@ -1284,7 +1284,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -783,8 +818,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-05-23 18:44:10.556397443 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-13 14:50:35.566142965 +0000 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -795,8 +830,8 @@ if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) { iMatchKey = cRowset.findColumn(strMatchKey); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-13 14:50:35.566142965 +0000 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -811,8 +846,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-13 14:50:35.566142965 +0000 @@ -152,7 +152,7 @@ // new configuration @@ -841,8 +876,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-13 14:50:35.566142965 +0000 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -853,8 +888,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-02-13 14:50:35.566142965 +0000 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -865,8 +900,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-02-13 14:50:35.566142965 +0000 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -877,8 +912,8 @@ /** * Initialize this <code>LoginModule</code>. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-02-13 14:50:35.566142965 +0000 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -889,8 +924,8 @@ /** * Initialize this <code>LoginModule</code>. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-02-13 14:50:35.566142965 +0000 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -901,8 +936,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-02-13 14:50:35.566142965 +0000 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -913,8 +948,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2013-02-13 14:50:35.570143029 +0000 @@ -95,7 +95,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -925,8 +960,8 @@ private Class beanClass; private BeanInfo explicitBeanInfo; 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-02-13 14:50:35.570143029 +0000 @@ -42,7 +42,7 @@ */ final class ThreadGroupContext { @@ -946,8 +981,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-02-13 14:50:35.570143029 +0000 @@ -34,7 +34,7 @@ */ @@ -967,8 +1002,8 @@ // reverse the list to maintain previous jdk deletion order. // Last in first deleted. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2013-02-13 14:50:35.570143029 +0000 @@ -57,7 +57,7 @@ private volatile boolean closed = false; @@ -979,8 +1014,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2013-02-13 14:50:35.570143029 +0000 @@ -1082,7 +1082,7 @@ if ((names == null) || (filter == null)) { return names; @@ -1009,8 +1044,8 @@ File f = new File(s, this); if ((filter == null) || filter.accept(f)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2013-02-13 14:50:35.570143029 +0000 @@ -70,7 +70,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -1021,8 +1056,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2012-05-23 18:44:10.560397509 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2013-02-13 14:50:35.570143029 +0000 @@ -725,7 +725,7 @@ */ @@ -1051,8 +1086,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-05-23 18:44:10.564397574 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-02-13 14:50:35.570143029 +0000 @@ -213,7 +213,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -1077,8 +1112,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-05-23 18:44:10.564397574 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-02-13 14:50:35.570143029 +0000 @@ -165,11 +165,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1103,8 +1138,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-05-23 18:44:10.564397574 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-02-13 14:50:35.574143093 +0000 @@ -84,18 +84,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1185,8 +1220,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2012-05-23 18:44:10.564397574 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2013-02-13 14:50:35.574143093 +0000 @@ -47,7 +47,7 @@ } } @@ -1197,8 +1232,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2012-05-23 18:44:10.564397574 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2013-02-13 14:50:35.574143093 +0000 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1219,8 +1254,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2012-05-23 18:44:10.564397574 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2013-02-13 14:50:35.574143093 +0000 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1231,9 +1266,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2012-05-23 18:44:10.564397574 +0100 -@@ -1308,7 +1308,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2013-02-13 14:50:35.574143093 +0000 +@@ -1310,7 +1310,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { public Class[] run() { @@ -1242,7 +1277,7 @@ Class<?> currentClass = Class.this; while (currentClass != null) { Class<?>[] members = currentClass.getDeclaredClasses(); -@@ -2308,9 +2308,9 @@ +@@ -2317,9 +2317,9 @@ res = Reflection.filterFields(this, getDeclaredFields0(publicOnly)); if (useCaches) { if (publicOnly) { @@ -1254,7 +1289,7 @@ } } return res; -@@ -2332,9 +2332,9 @@ +@@ -2341,9 +2341,9 @@ // No cached value available; compute value recursively. // Traverse in correct order for getField(). @@ -1266,7 +1301,7 @@ } // Local fields -@@ -2360,7 +2360,7 @@ +@@ -2369,7 +2369,7 @@ res = new Field[fields.size()]; fields.toArray(res); if (useCaches) { @@ -1275,7 +1310,7 @@ } return res; } -@@ -2405,9 +2405,9 @@ +@@ -2414,9 +2414,9 @@ } if (useCaches) { if (publicOnly) { @@ -1287,7 +1322,7 @@ } } return res; -@@ -2442,9 +2442,9 @@ +@@ -2451,9 +2451,9 @@ res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly)); if (useCaches) { if (publicOnly) { @@ -1299,7 +1334,7 @@ } } return res; -@@ -2600,7 +2600,7 @@ +@@ -2609,7 +2609,7 @@ methods.compactAndTrim(); res = methods.getArray(); if (useCaches) { @@ -1308,7 +1343,7 @@ } return res; } -@@ -2979,7 +2979,7 @@ +@@ -2988,7 +2988,7 @@ if (universe == null) throw new IllegalArgumentException( getName() + " is not an enum type"); @@ -1317,7 +1352,7 @@ for (T constant : universe) m.put(((Enum<?>)constant).name(), constant); enumConstantDirectory = m; -@@ -3092,7 +3092,7 @@ +@@ -3101,7 +3101,7 @@ if (superClass == null) { annotations = declaredAnnotations; } else { @@ -1327,8 +1362,8 @@ for (Map.Entry<Class<? extends Annotation>, Annotation> e : superClass.annotations.entrySet()) { Class<? extends Annotation> annotationClass = e.getKey(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2013-02-13 14:50:35.574143093 +0000 @@ -246,7 +246,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1435,8 +1470,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2013-02-13 14:50:35.578143158 +0000 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -1478,8 +1513,8 @@ // 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/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 2012-05-23 18:42:49.151061559 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-02-13 14:50:01.033588115 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-02-13 14:50:35.578143158 +0000 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -1490,8 +1525,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2013-02-13 14:50:35.578143158 +0000 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -1529,8 +1564,8 @@ // Use String as the key rather than Class<?> to avoid // causing unnecessary class loading of management interface diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2012-05-23 18:42:49.231062871 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2013-02-13 14:50:01.089589016 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2013-02-13 14:50:35.578143158 +0000 @@ -596,13 +596,16 @@ } @@ -1552,8 +1587,8 @@ private static native String getSystemPackage0(String name); private static native String[] getSystemPackages0(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-02-13 14:50:35.578143158 +0000 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1573,8 +1608,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2013-02-13 14:50:35.578143158 +0000 @@ -136,7 +136,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1585,9 +1620,9 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2012-05-23 18:44:10.568397640 +0100 -@@ -232,7 +232,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-02-13 14:50:35.586143286 +0000 +@@ -238,7 +238,7 @@ /** maps a class loader to the proxy class cache for that loader */ private static Map<ClassLoader, Map<List<String>, Object>> loaderToCache @@ -1596,7 +1631,7 @@ /** marks that a particular proxy class is currently being generated */ private static Object pendingGenerationMarker = new Object(); -@@ -356,7 +356,7 @@ +@@ -467,7 +467,7 @@ String[] interfaceNames = new String[interfaces.length]; // for detecting duplicates @@ -1605,7 +1640,7 @@ for (int i = 0; i < interfaces.length; i++) { /* -@@ -413,7 +413,7 @@ +@@ -524,7 +524,7 @@ synchronized (loaderToCache) { cache = loaderToCache.get(loader); if (cache == null) { @@ -1615,8 +1650,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2013-02-13 14:50:35.586143286 +0000 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1627,8 +1662,8 @@ checkedExceptions, modifiers, diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2013-02-13 14:50:35.586143286 +0000 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -1642,8 +1677,8 @@ private static boolean warnUnsupportedCharset = true; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java openjdk-boot/jdk/src/share/classes/java/lang/String.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2013-02-13 14:50:35.586143286 +0000 @@ -2330,7 +2330,7 @@ int off = 0; int next = 0; @@ -1654,8 +1689,8 @@ if (!limited || list.size() < limit - 1) { list.add(substring(off, next)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java openjdk-boot/jdk/src/share/classes/java/lang/Thread.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2012-05-23 18:44:10.568397640 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2013-02-13 14:50:35.586143286 +0000 @@ -1616,7 +1616,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -1681,8 +1716,8 @@ /** 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2013-02-13 14:50:35.586143286 +0000 @@ -917,7 +917,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -1702,8 +1737,8 @@ suppressedExceptions.add(exception); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java ---- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2013-02-13 14:50:35.586143286 +0000 @@ -677,7 +677,7 @@ static InetAddressImpl impl; @@ -1723,8 +1758,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2013-02-13 14:50:35.586143286 +0000 @@ -205,7 +205,7 @@ */ @@ -1735,8 +1770,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 2012-05-23 18:42:49.231062871 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2013-02-13 14:50:01.093589080 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2013-02-13 14:50:35.590143350 +0000 @@ -1487,7 +1487,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -1756,8 +1791,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2013-02-13 14:50:35.590143350 +0000 @@ -124,7 +124,7 @@ this.context = null; } @@ -1768,8 +1803,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2013-02-13 14:50:35.590143350 +0000 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -1780,8 +1815,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2013-02-13 14:50:35.590143350 +0000 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -1805,8 +1840,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2013-02-13 14:50:35.590143350 +0000 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -1826,8 +1861,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2013-02-13 14:50:35.590143350 +0000 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -1847,8 +1882,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2013-02-13 14:50:35.590143350 +0000 @@ -368,8 +368,8 @@ int swag = 32; int vcap = 8; @@ -1861,8 +1896,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2013-02-13 14:50:35.590143350 +0000 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -1891,8 +1926,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2012-05-23 18:44:10.572397706 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2013-02-13 14:50:35.590143350 +0000 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -1903,8 +1938,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2013-02-13 14:50:35.590143350 +0000 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -1951,8 +1986,8 @@ for (int i = 0; i < providers.length; i++) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2013-02-13 14:50:35.590143350 +0000 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -1990,8 +2025,8 @@ // Add to Hashtable being serialized diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2013-02-13 14:50:35.590143350 +0000 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -2002,8 +2037,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2013-02-13 14:50:35.594143415 +0000 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -2033,8 +2068,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2013-02-13 14:50:35.594143415 +0000 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -2045,8 +2080,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2013-02-13 14:50:35.594143415 +0000 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -2672,8 +2707,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2013-02-13 14:50:35.594143415 +0000 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -2684,8 +2719,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2012-05-23 18:44:10.576397771 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2013-02-13 14:50:35.594143415 +0000 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -2708,8 +2743,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 2012-05-23 18:42:49.151061559 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2013-02-13 14:50:01.033588115 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2013-02-13 14:50:35.598143479 +0000 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -2720,8 +2755,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2013-02-13 14:50:35.598143479 +0000 @@ -763,7 +763,7 @@ */ void addEntry(int hash, K key, V value, int bucketIndex) { @@ -2741,8 +2776,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2013-02-13 14:50:35.598143479 +0000 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -2789,8 +2824,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2013-02-13 14:50:35.598143479 +0000 @@ -455,7 +455,7 @@ // Creates the new entry. @@ -2846,8 +2881,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2013-02-13 14:50:35.598143479 +0000 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -2867,8 +2902,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2013-02-13 14:50:35.598143479 +0000 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -2879,8 +2914,8 @@ private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2013-02-13 14:50:35.598143479 +0000 @@ -237,7 +237,7 @@ * the chain. */ @@ -2900,8 +2935,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2013-02-13 14:50:35.598143479 +0000 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -2939,8 +2974,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2013-02-13 14:50:35.598143479 +0000 @@ -187,7 +187,7 @@ return; @@ -2951,8 +2986,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2013-02-13 14:50:35.598143479 +0000 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -2963,8 +2998,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2012-05-23 18:44:10.580397837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2013-02-13 14:50:35.598143479 +0000 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -2975,20 +3010,39 @@ // 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2012-05-23 18:44:10.580397837 +0100 -@@ -59,7 +59,7 @@ - */ - - public class Level implements java.io.Serializable { -- private static java.util.ArrayList<Level> known = new java.util.ArrayList<>(); -+ private static java.util.ArrayList<Level> known = new java.util.ArrayList<Level>(); - private static String defaultBundle = "sun.util.logging.resources.logging"; - - /** +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2013-02-13 14:52:01.963531185 +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<String, List<KnownLevel>> nameToLevels = new HashMap<>(); +- private static Map<Integer, List<KnownLevel>> intToLevels = new HashMap<>(); ++ private static Map<String, List<KnownLevel>> nameToLevels = new HashMap<String,List<KnownLevel>>(); ++ private static Map<Integer, List<KnownLevel>> intToLevels = new HashMap<Integer,List<KnownLevel>>(); + 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<KnownLevel> list = nameToLevels.get(l.name); + if (list == null) { +- list = new ArrayList<>(); ++ list = new ArrayList<KnownLevel>(); + nameToLevels.put(l.name, list); + } + list.add(o); + + list = intToLevels.get(l.value); + if (list == null) { +- list = new ArrayList<>(); ++ list = new ArrayList<KnownLevel>(); + 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2013-02-13 14:50:35.602143543 +0000 @@ -170,7 +170,7 @@ private LogManager manager; private String name; @@ -2998,7 +3052,7 @@ private String resourceBundleName; private volatile boolean useParentHandlers = true; private volatile Filter filter; -@@ -1439,7 +1439,7 @@ +@@ -1505,7 +1505,7 @@ // Set our new parent. parent = newParent; if (parent.kids == null) { @@ -3008,8 +3062,8 @@ if (ref == null) { // we didn't have a previous parent diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2013-02-13 14:50:35.602143543 +0000 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -3020,19 +3074,36 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2012-05-23 18:44:10.584397903 +0100 -@@ -156,7 +156,8 @@ - private final static Level defaultLevel = Level.INFO; - - // Table of named Loggers that maps names to Loggers. -- private Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<>(); -+ private Hashtable<String,LoggerWeakRef> namedLoggers = -+ new Hashtable<String,LoggerWeakRef>(); - // Tree of named Loggers - private LogNode root = new LogNode(null); - private Logger rootLogger; -@@ -444,7 +445,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2013-02-13 14:51:37.315135132 +0000 +@@ -375,7 +375,7 @@ + } + + private List<LoggerContext> contexts() { +- List<LoggerContext> cxs = new ArrayList<>(); ++ List<LoggerContext> cxs = new ArrayList<LoggerContext>(); + cxs.add(systemContext); + cxs.add(getUserContext()); + return cxs; +@@ -435,7 +435,7 @@ + // added in the user context. + static class LoggerContext { + // Table of named Loggers that maps names to Loggers. +- private final Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<>(); ++ private final Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<String,LoggerWeakRef>(); + // Tree of named Loggers + private final LogNode root; + +@@ -584,7 +584,7 @@ + name = ""; + } + if (node.children == null) { +- node.children = new HashMap<>(); ++ node.children = new HashMap<String,LogNode>(); + } + LogNode child = node.children.get(head); + if (child == null) { +@@ -691,7 +691,7 @@ // loggerRefQueue holds LoggerWeakRef objects for Logger objects // that have been GC'ed. private final ReferenceQueue<Logger> loggerRefQueue @@ -3041,16 +3112,7 @@ // Package-level inner class. // Helper class for managing WeakReferences to Logger objects. -@@ -694,7 +695,7 @@ - name = ""; - } - if (node.children == null) { -- node.children = new HashMap<>(); -+ node.children = new HashMap<String,LogNode>(); - } - LogNode child = node.children.get(head); - if (child == null) { -@@ -878,7 +879,7 @@ +@@ -1033,7 +1033,7 @@ } hands = hands.trim(); int ix = 0; @@ -3060,8 +3122,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2013-02-13 14:50:35.602143543 +0000 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -3073,8 +3135,8 @@ /** * @serial Logging message level diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2013-02-13 14:50:35.602143543 +0000 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -3105,8 +3167,8 @@ /** * 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2013-02-13 14:50:35.602143543 +0000 @@ -538,7 +538,7 @@ cursor--; else { @@ -3117,8 +3179,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2013-02-13 14:50:35.602143543 +0000 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -3129,8 +3191,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2013-02-13 14:50:35.606143608 +0000 @@ -321,7 +321,7 @@ * <td headers="matches">Nothing, but quotes all characters until <tt>\E</tt></td></tr> * <tr><td valign="top" headers="construct quot"><tt>\E</tt></td> @@ -3168,8 +3230,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2013-02-13 14:50:35.606143608 +0000 @@ -193,8 +193,8 @@ } }; @@ -3182,8 +3244,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2012-05-23 18:44:10.584397903 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2013-02-13 14:50:35.606143608 +0000 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -3194,8 +3256,8 @@ private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2013-02-13 14:50:35.606143608 +0000 @@ -289,7 +289,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -3260,8 +3322,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2013-02-13 14:50:35.606143608 +0000 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3280,7 +3342,7 @@ try { in = u.openStream(); r = new BufferedReader(new InputStreamReader(in, "utf-8")); -@@ -463,7 +463,7 @@ +@@ -470,7 +470,7 @@ public static <S> ServiceLoader<S> load(Class<S> service, ClassLoader loader) { @@ -3290,8 +3352,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2013-02-13 14:50:35.606143608 +0000 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3302,8 +3364,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2013-02-13 14:50:35.606143608 +0000 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3359,8 +3421,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2013-02-13 14:50:35.606143608 +0000 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3428,8 +3490,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2013-02-13 14:50:35.606143608 +0000 @@ -171,7 +171,7 @@ /** * Reference queue for cleared WeakEntries @@ -3462,8 +3524,8 @@ } 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2013-02-13 14:50:35.606143608 +0000 @@ -319,7 +319,7 @@ // the outstanding inputstreams that need to be closed, @@ -3492,8 +3554,8 @@ for (Map.Entry<InputStream, Inflater> e : copy.entrySet()) { e.getKey().close(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2013-02-13 14:50:35.610143671 +0000 @@ -53,8 +53,8 @@ } @@ -3506,8 +3568,8 @@ private long written = 0; private long locoff = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2013-02-13 14:50:35.610143671 +0000 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -3518,8 +3580,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2013-02-13 14:50:35.610143671 +0000 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -3530,8 +3592,8 @@ synchronized (this) { permissions.addAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2013-02-13 14:50:35.610143671 +0000 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -3542,8 +3604,8 @@ String principalClass = null; String principalName = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2013-02-13 14:50:35.610143671 +0000 @@ -48,7 +48,7 @@ private Subject subject; @@ -3554,8 +3616,8 @@ private Principal[] principals; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-05-23 18:42:49.267063462 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-02-13 14:50:01.145589915 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-02-13 14:50:35.610143671 +0000 @@ -59,7 +59,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap[n]; // unchecked warning expected here @@ -3593,8 +3655,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2013-02-13 14:50:35.610143671 +0000 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -3605,8 +3667,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2012-05-23 18:44:10.588397968 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2013-02-13 14:50:35.610143671 +0000 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -3617,8 +3679,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 2012-05-23 18:42:49.083060443 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-13 14:50:00.953586831 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-13 14:50:35.610143671 +0000 @@ -169,7 +169,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -3638,8 +3700,8 @@ sortedSet.add(l.toString()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2013-02-13 14:50:35.614143736 +0000 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -3650,8 +3712,8 @@ .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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2013-02-13 14:50:35.614143736 +0000 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -3680,8 +3742,8 @@ // do the query diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2013-02-13 14:50:35.614143736 +0000 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -3692,8 +3754,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2013-02-13 14:50:35.614143736 +0000 @@ -2628,7 +2628,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -3713,8 +3775,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2013-02-13 14:50:35.614143736 +0000 @@ -239,7 +239,7 @@ url = null; } @@ -3725,8 +3787,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2013-02-13 14:50:35.614143736 +0000 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -3764,8 +3826,8 @@ return new Iterator<Charset>() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2013-02-13 14:50:35.614143736 +0000 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -3776,8 +3838,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2013-02-13 14:50:35.614143736 +0000 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -3790,8 +3852,8 @@ private AttributesBuilder(Set<String> allowed, String[] requested) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2013-02-13 14:50:35.622143865 +0000 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -3802,8 +3864,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2013-02-13 14:50:35.622143865 +0000 @@ -77,7 +77,7 @@ throws IOException { @@ -3823,8 +3885,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2013-02-13 14:50:35.622143865 +0000 @@ -71,7 +71,7 @@ @Override @@ -3835,8 +3897,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2013-02-13 14:50:35.622143865 +0000 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -3856,8 +3918,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2012-05-23 18:44:10.592398034 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2013-02-13 14:50:35.622143865 +0000 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -3922,9 +3984,9 @@ ets.add(parseThrowsSignature()); } 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2012-05-23 18:44:10.592398034 +0100 -@@ -149,10 +149,10 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2013-02-13 14:50:35.622143865 +0000 +@@ -150,10 +150,10 @@ /** maps activation id to its respective group id */ private Map<ActivationID,ActivationGroupID> idTable = @@ -3937,7 +3999,7 @@ private byte majorVersion = MAJOR_VERSION; private byte minorVersion = MINOR_VERSION; -@@ -288,10 +288,10 @@ +@@ -289,10 +289,10 @@ { ois.defaultReadObject(); if (! (groupTable instanceof ConcurrentHashMap)) { @@ -3951,8 +4013,8 @@ } 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2013-02-13 14:50:35.622143865 +0000 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -3963,8 +4025,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2013-02-13 14:50:35.622143865 +0000 @@ -41,15 +41,15 @@ // or principal. // @@ -4005,8 +4067,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2013-02-13 14:50:35.622143865 +0000 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -4026,8 +4088,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2013-02-13 14:50:35.622143865 +0000 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -4065,8 +4127,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2013-02-13 14:50:35.622143865 +0000 @@ -40,7 +40,7 @@ public class Providers { @@ -4077,8 +4139,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2013-02-13 14:50:35.622143865 +0000 @@ -267,7 +267,7 @@ if (ktabs.isEmpty()) { return kk.toArray(new KerberosKey[kk.size()]); @@ -4089,8 +4151,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2013-02-13 14:50:35.626143928 +0000 @@ -551,7 +551,7 @@ } }))); @@ -4168,8 +4230,8 @@ for (int i = 0; i < len; i++) { type = getType(st.nextToken()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2013-02-13 14:50:35.626143928 +0000 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4180,8 +4242,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2013-02-13 14:50:35.626143928 +0000 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4192,8 +4254,8 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-02-13 14:50:35.626143928 +0000 @@ -490,7 +490,7 @@ private static String exec(String c) { @@ -4204,8 +4266,8 @@ v.addElement(st.nextToken()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2013-02-13 14:50:35.626143928 +0000 @@ -257,7 +257,7 @@ + configName); } @@ -4216,8 +4278,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2013-02-13 14:50:35.626143928 +0000 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4228,8 +4290,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2013-02-13 14:50:35.626143928 +0000 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -4249,8 +4311,8 @@ for (int i = 0; i < addresses.length; i++) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2013-02-13 14:50:35.626143928 +0000 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -4279,8 +4341,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2013-02-13 14:50:35.626143928 +0000 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4291,8 +4353,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2013-02-13 14:50:35.626143928 +0000 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4303,8 +4365,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2013-02-13 14:50:35.626143928 +0000 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4315,8 +4377,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2013-02-13 14:50:35.626143928 +0000 @@ -259,7 +259,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -4327,8 +4389,8 @@ // read the PA-DATA DerValue tmp = derPA.data.getDerValue(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-05-23 18:42:49.235062937 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-02-13 14:50:01.105589273 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-02-13 14:50:35.626143928 +0000 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -4366,8 +4428,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2012-05-23 18:44:10.596398100 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2013-02-13 14:50:35.630143993 +0000 @@ -77,7 +77,7 @@ */ @@ -4378,8 +4440,8 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-02-13 14:50:35.630143993 +0000 @@ -462,7 +462,7 @@ */ static class KdcAccessibility { @@ -4402,8 +4464,8 @@ String t = st.nextToken(); if (bads.contains(t)) badkdcs.add(t); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2013-02-13 14:50:35.630143993 +0000 @@ -238,7 +238,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4423,8 +4485,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2013-02-13 14:50:35.630143993 +0000 @@ -359,14 +359,14 @@ } @@ -4443,8 +4505,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2013-02-13 14:50:35.630143993 +0000 @@ -590,7 +590,7 @@ // Except the performance improvement, another benefit is to break // the dead loop while looking for the issuer back and forth @@ -4455,8 +4517,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2013-02-13 14:50:35.630143993 +0000 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -4467,8 +4529,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2013-02-13 14:50:35.630143993 +0000 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -4524,8 +4586,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2013-02-13 14:50:35.630143993 +0000 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -4536,8 +4598,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2013-02-13 14:50:35.630143993 +0000 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4548,8 +4610,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2013-02-13 14:50:35.630143993 +0000 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -4595,8 +4657,8 @@ } catch (ParsingException e) { while (data != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2013-02-13 14:50:35.630143993 +0000 @@ -219,7 +219,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -4607,8 +4669,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2013-02-13 14:50:35.634144058 +0000 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4619,8 +4681,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2013-02-13 14:50:35.634144058 +0000 @@ -393,7 +393,7 @@ // Map BulkCipher -> Boolean(available) @@ -4631,9 +4693,9 @@ // descriptive name including key size, e.g. AES/128 final String description; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2012-05-23 18:44:10.600398165 +0100 -@@ -656,7 +656,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-02-13 14:50:35.634144058 +0000 +@@ -659,7 +659,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -4642,7 +4704,7 @@ for (int i = 0; i < certRequest.types.length; i++) { String typeName; -@@ -1176,7 +1176,7 @@ +@@ -1179,7 +1179,7 @@ "Can't reuse existing SSL client session"); } @@ -4651,7 +4713,7 @@ cipherList.add(sessionSuite); if (!secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { -@@ -1194,7 +1194,7 @@ +@@ -1197,7 +1197,7 @@ // exclude SCSV for secure renegotiation if (secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { Collection<CipherSuite> cipherList = @@ -4661,9 +4723,9 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2012-05-23 18:44:10.600398165 +0100 -@@ -258,7 +258,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2013-02-13 14:50:35.634144058 +0000 +@@ -260,7 +260,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { // We would have checked that the hostname ia a FQDN. @@ -4672,7 +4734,7 @@ hostnames.add(hostname); try { -@@ -434,7 +434,7 @@ +@@ -436,7 +436,7 @@ CertificateMsg(HandshakeInStream input) throws IOException { int chainLen = input.getInt24(); @@ -4681,7 +4743,7 @@ CertificateFactory cf = null; while (chainLen > 0) { -@@ -1334,7 +1334,7 @@ +@@ -1346,7 +1346,7 @@ // read the certificate_authorities int len = input.getInt16(); @@ -4690,7 +4752,7 @@ while (len >= 3) { DistinguishedName dn = new DistinguishedName(input); v.add(dn); -@@ -1725,7 +1725,7 @@ +@@ -1737,7 +1737,7 @@ // Note that this will prevent the Spi classes from being GC'd. We assume // that is not a problem. private final static Map<Class,Object> methodCache = @@ -4700,8 +4762,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-02-13 14:50:35.634144058 +0000 @@ -569,7 +569,7 @@ activeProtocols = getActiveProtocols(); } @@ -4721,8 +4783,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2013-02-13 14:50:35.634144058 +0000 @@ -169,7 +169,7 @@ return name; } @@ -4742,8 +4804,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2012-05-23 18:44:10.600398165 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2013-02-13 14:50:35.634144058 +0000 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -4754,8 +4816,8 @@ ProtocolVersion version = ProtocolVersion.valueOf(names[i]); if (versions.contains(version) == false) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-02-13 14:50:35.634144058 +0000 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -4793,8 +4855,8 @@ for (SignatureAndHashAlgorithm sigAlg : algorithms) { if (sigAlg.hash.value > 0) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2013-02-13 14:50:35.634144058 +0000 @@ -261,7 +261,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -4841,8 +4903,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2012-05-23 18:44:37.160834043 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2013-02-13 14:50:35.634144058 +0000 @@ -325,7 +325,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -4871,8 +4933,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-02-13 14:50:35.638144121 +0000 @@ -618,7 +618,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -4892,8 +4954,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-02-13 14:50:35.638144121 +0000 @@ -2478,7 +2478,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -4904,8 +4966,8 @@ } 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2013-02-13 14:50:35.638144121 +0000 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -4925,8 +4987,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2013-02-13 14:50:35.638144121 +0000 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -4937,8 +4999,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2013-02-13 14:50:35.638144121 +0000 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -4958,8 +5020,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-02-13 14:50:35.638144121 +0000 @@ -123,14 +123,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -5041,8 +5103,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 2012-05-23 18:42:49.239063003 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-05-23 18:44:10.604398231 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-13 14:50:01.105589273 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-13 14:50:35.638144121 +0000 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -5113,8 +5175,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2013-02-13 14:50:35.642144186 +0000 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -5152,8 +5214,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 2012-05-23 18:42:49.239063003 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-13 14:50:01.105589273 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-13 14:50:35.642144186 +0000 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -5163,9 +5225,120 @@ /** * Checks if a certificate is untrusted. +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-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2013-02-13 14:50:35.658144443 +0000 +@@ -1214,7 +1214,7 @@ + if (exts == null) { + return null; + } +- Set<String> extSet = new TreeSet<>(); ++ Set<String> extSet = new TreeSet<String>(); + for (Extension ex : exts.getAllExtensions()) { + if (ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -1244,7 +1244,7 @@ + if (exts == null) { + return null; + } +- Set<String> extSet = new TreeSet<>(); ++ Set<String> extSet = new TreeSet<String>(); + for (Extension ex : exts.getAllExtensions()) { + if (!ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -1484,10 +1484,10 @@ + if (names.isEmpty()) { + return Collections.<List<?>>emptySet(); + } +- List<List<?>> newNames = new ArrayList<>(); ++ List<List<?>> newNames = new ArrayList<List<?>>(); + for (GeneralName gname : names.names()) { + GeneralNameInterface name = gname.getName(); +- List<Object> nameEntry = new ArrayList<>(2); ++ List<Object> nameEntry = new ArrayList<Object>(2); + nameEntry.add(Integer.valueOf(name.getType())); + switch (name.getType()) { + case GeneralNameInterface.NAME_RFC822: +@@ -1545,12 +1545,12 @@ + } + } + if (mustClone) { +- List<List<?>> namesCopy = new ArrayList<>(); ++ List<List<?>> namesCopy = new ArrayList<List<?>>(); + for (List<?> nameEntry : altNames) { + Object nameObject = nameEntry.get(1); + if (nameObject instanceof byte[]) { + List<Object> nameEntryCopy = +- new ArrayList<>(nameEntry); ++ new ArrayList<Object>(nameEntry); + 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-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2013-02-13 14:50:35.662144507 +0000 +@@ -352,7 +352,7 @@ + if (extensions == null) { + return null; + } +- Set<String> extSet = new TreeSet<>(); ++ Set<String> extSet = new TreeSet<String>(); + for (Extension ex : extensions.getAllExtensions()) { + if (ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -373,7 +373,7 @@ + if (extensions == null) { + return null; + } +- Set<String> extSet = new TreeSet<>(); ++ Set<String> extSet = new TreeSet<String>(); + for (Extension ex : extensions.getAllExtensions()) { + if (!ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -510,7 +510,7 @@ + return Collections.emptyMap(); + } + Collection<Extension> exts = extensions.getAllExtensions(); +- Map<String, java.security.cert.Extension> map = new TreeMap<>(); ++ Map<String, java.security.cert.Extension> map = new TreeMap<String, java.security.cert.Extension>(); + 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-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2013-02-13 14:50:35.662144507 +0000 +@@ -104,8 +104,8 @@ + private X500Principal issuerPrincipal = null; + private Date thisUpdate = null; + private Date nextUpdate = null; +- private Map<X509IssuerSerial,X509CRLEntry> revokedMap = new TreeMap<>(); +- private List<X509CRLEntry> revokedList = new LinkedList<>(); ++ private Map<X509IssuerSerial,X509CRLEntry> revokedMap = new TreeMap<X509IssuerSerial,X509CRLEntry>(); ++ private List<X509CRLEntry> revokedList = new LinkedList<X509CRLEntry>(); + 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<String> extSet = new TreeSet<>(); ++ Set<String> extSet = new TreeSet<String>(); + for (Extension ex : extensions.getAllExtensions()) { + if (ex.isCritical()) { + extSet.add(ex.getExtensionId().toString()); +@@ -928,7 +928,7 @@ + if (extensions == null) { + return null; + } +- Set<String> extSet = new TreeSet<>(); ++ Set<String> extSet = new TreeSet<String>(); + 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2013-02-13 14:50:35.642144186 +0000 @@ -94,7 +94,7 @@ * Run the converter */ @@ -5176,8 +5349,8 @@ boolean createOutputFile = false; 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2013-02-13 14:50:35.642144186 +0000 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -5292,8 +5465,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2013-02-13 14:50:35.642144186 +0000 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -5349,8 +5522,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2013-02-13 14:50:35.642144186 +0000 @@ -81,7 +81,7 @@ } @@ -5378,8 +5551,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-02-13 14:50:35.642144186 +0000 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -5416,8 +5589,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2013-02-13 14:50:35.642144186 +0000 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -5437,8 +5610,8 @@ 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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2013-02-13 14:50:35.642144186 +0000 @@ -113,7 +113,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -5467,8 +5640,8 @@ static { if (LoggingSupport.isAvailable()) { diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2013-02-13 14:50:35.642144186 +0000 @@ -160,7 +160,7 @@ } @@ -5503,8 +5676,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2013-02-13 14:50:35.642144186 +0000 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -5517,8 +5690,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2013-02-13 14:50:35.646144250 +0000 @@ -134,7 +134,7 @@ throws IOException { @@ -5529,8 +5702,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2013-02-13 14:50:35.646144250 +0000 @@ -157,7 +157,7 @@ @Override @@ -5631,8 +5804,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2013-02-13 14:50:35.654144378 +0000 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -5643,8 +5816,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2013-02-13 14:50:35.654144378 +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. @@ -5655,8 +5828,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 2012-05-23 18:42:49.247063134 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-13 14:50:01.105589273 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-13 14:50:35.654144378 +0000 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -5721,8 +5894,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-05-23 18:44:10.608398297 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-13 14:50:35.654144378 +0000 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -5742,8 +5915,8 @@ if (domain != null && domain.length() > 0) { sl.add(domain); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2013-02-13 14:50:35.654144378 +0000 @@ -153,12 +153,12 @@ static { @@ -5762,8 +5935,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2013-02-13 14:50:35.654144378 +0000 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -5783,8 +5956,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2013-02-13 14:50:35.654144378 +0000 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -5795,8 +5968,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2013-02-13 14:50:35.654144378 +0000 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -5807,8 +5980,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2013-02-13 14:50:35.654144378 +0000 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -5828,8 +6001,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2013-02-13 14:50:35.654144378 +0000 @@ -83,7 +83,7 @@ } @@ -5840,8 +6013,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2013-02-13 14:50:35.654144378 +0000 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -5852,8 +6025,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2013-02-13 14:50:35.654144378 +0000 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -5875,8 +6048,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-13 14:50:35.658144443 +0000 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -5887,8 +6060,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2013-02-13 14:50:35.658144443 +0000 @@ -128,7 +128,7 @@ } @@ -5899,8 +6072,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2013-02-13 14:50:35.658144443 +0000 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -5911,8 +6084,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 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2013-02-13 14:50:35.658144443 +0000 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -5923,8 +6096,8 @@ // decode each of the ACEs to AclEntry objects for (int i=0; i<aceCount; i++) { diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2013-02-13 14:50:35.658144443 +0000 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -5971,8 +6144,8 @@ opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); opts.add(CREATE); diff -Nru openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java ---- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2013-02-13 14:50:35.658144443 +0000 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -5983,8 +6156,8 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(baos); diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java ---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2013-02-13 14:50:35.658144443 +0000 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -5995,8 +6168,8 @@ private int pos; private int newPos; diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java ---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2013-02-13 14:50:35.658144443 +0000 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -6007,8 +6180,8 @@ public int stackSize(int currentSize) { return currentSize + 1; diff -Nru openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java ---- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2013-02-13 14:50:35.658144443 +0000 @@ -103,7 +103,7 @@ } } @@ -6019,8 +6192,8 @@ private static void check(Type t, String what) { if (t == null || !checking.add(t)) diff -Nru openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java ---- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2013-02-13 14:50:35.658144443 +0000 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -6031,8 +6204,8 @@ Thread appThread = new Thread(appsThreadGroup, launcher, "AppThread-0"); diff -Nru openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java ---- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2012-05-23 18:33:36.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2012-05-23 18:44:10.612398362 +0100 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2013-02-13 14:50:35.658144443 +0000 @@ -59,7 +59,7 @@ } } @@ -6042,131 +6215,3 @@ List<Thread> threads = new ArrayList<Thread>(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/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 2012-10-17 02:42:13.610815469 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-10-17 02:43:02.995461481 +0100 -@@ -62,9 +62,10 @@ - */ - public final class DocumentHandler extends DefaultHandler { - private final AccessControlContext acc = AccessController.getContext(); -- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>(); -- private final Map<String, Object> environment = new HashMap<>(); -- private final List<Object> objects = new ArrayList<>(); -+ private final Map<String, Class<? extends ElementHandler>> handlers = -+ new HashMap<String, Class<? extends ElementHandler>>(); -+ private final Map<String, Object> environment = new HashMap<String, Object>(); -+ private final List<Object> objects = new ArrayList<Object>(); - - private Reference<ClassLoader> loader; - private ExceptionListener listener; -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 2012-06-13 00:23:50.888084888 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2012-06-13 00:24:25.328561965 +0100 -@@ -1214,7 +1214,7 @@ - if (exts == null) { - return null; - } -- Set<String> extSet = new TreeSet<>(); -+ Set<String> extSet = new TreeSet<String>(); - for (Extension ex : exts.getAllExtensions()) { - if (ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -1244,7 +1244,7 @@ - if (exts == null) { - return null; - } -- Set<String> extSet = new TreeSet<>(); -+ Set<String> extSet = new TreeSet<String>(); - for (Extension ex : exts.getAllExtensions()) { - if (!ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -1484,10 +1484,10 @@ - if (names.isEmpty()) { - return Collections.<List<?>>emptySet(); - } -- List<List<?>> newNames = new ArrayList<>(); -+ List<List<?>> newNames = new ArrayList<List<?>>(); - for (GeneralName gname : names.names()) { - GeneralNameInterface name = gname.getName(); -- List<Object> nameEntry = new ArrayList<>(2); -+ List<Object> nameEntry = new ArrayList<Object>(2); - nameEntry.add(Integer.valueOf(name.getType())); - switch (name.getType()) { - case GeneralNameInterface.NAME_RFC822: -@@ -1545,12 +1545,12 @@ - } - } - if (mustClone) { -- List<List<?>> namesCopy = new ArrayList<>(); -+ List<List<?>> namesCopy = new ArrayList<List<?>>(); - for (List<?> nameEntry : altNames) { - Object nameObject = nameEntry.get(1); - if (nameObject instanceof byte[]) { - List<Object> nameEntryCopy = -- new ArrayList<>(nameEntry); -+ new ArrayList<Object>(nameEntry); - 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 2012-06-13 00:23:34.591859370 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2012-06-13 00:25:17.953292153 +0100 -@@ -352,7 +352,7 @@ - if (extensions == null) { - return null; - } -- Set<String> extSet = new TreeSet<>(); -+ Set<String> extSet = new TreeSet<String>(); - for (Extension ex : extensions.getAllExtensions()) { - if (ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -373,7 +373,7 @@ - if (extensions == null) { - return null; - } -- Set<String> extSet = new TreeSet<>(); -+ Set<String> extSet = new TreeSet<String>(); - for (Extension ex : extensions.getAllExtensions()) { - if (!ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -510,7 +510,7 @@ - return Collections.emptyMap(); - } - Collection<Extension> exts = extensions.getAllExtensions(); -- Map<String, java.security.cert.Extension> map = new TreeMap<>(); -+ Map<String, java.security.cert.Extension> map = new TreeMap<String, java.security.cert.Extension>(); - 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 2012-06-13 00:23:41.063948918 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2012-06-13 00:24:53.264949412 +0100 -@@ -104,8 +104,8 @@ - private X500Principal issuerPrincipal = null; - private Date thisUpdate = null; - private Date nextUpdate = null; -- private Map<X509IssuerSerial,X509CRLEntry> revokedMap = new TreeMap<>(); -- private List<X509CRLEntry> revokedList = new LinkedList<>(); -+ private Map<X509IssuerSerial,X509CRLEntry> revokedMap = new TreeMap<X509IssuerSerial,X509CRLEntry>(); -+ private List<X509CRLEntry> revokedList = new LinkedList<X509CRLEntry>(); - 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<String> extSet = new TreeSet<>(); -+ Set<String> extSet = new TreeSet<String>(); - for (Extension ex : extensions.getAllExtensions()) { - if (ex.isCritical()) { - extSet.add(ex.getExtensionId().toString()); -@@ -928,7 +928,7 @@ - if (extensions == null) { - return null; - } -- Set<String> extSet = new TreeSet<>(); -+ Set<String> extSet = new TreeSet<String>(); - for (Extension ex : extensions.getAllExtensions()) { - if (!ex.isCritical()) { - extSet.add(ex.getExtensionId().toString());
--- a/patches/boot/ecj-multicatch.patch Wed Jan 16 01:26:58 2013 +0000 +++ b/patches/boot/ecj-multicatch.patch Wed Feb 13 16:13:30 2013 +0000 @@ -191,3 +191,17 @@ throw new RuntimeException( "Incorrect untrusted certificate: " + alias, e); } +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-02-02 16:14:27.971429681 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-02-02 16:14:58.283922372 +0000 +@@ -738,7 +738,9 @@ + private static Object newInstance(Constructor<?> cons, InvocationHandler h) { + try { + return cons.newInstance(new Object[] {h} ); +- } catch (IllegalAccessException | InstantiationException e) { ++ } catch (IllegalAccessException e) { ++ throw new InternalError(e.toString()); ++ } catch (InstantiationException e) { + throw new InternalError(e.toString()); + } catch (InvocationTargetException e) { + Throwable t = e.getCause();
--- a/patches/boot/ecj-trywithresources.patch Wed Jan 16 01:26:58 2013 +0000 +++ b/patches/boot/ecj-trywithresources.patch Wed Feb 13 16:13:30 2013 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-05-02 21:34:27.804140818 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-13 14:45:23.561130218 +0000 @@ -743,7 +743,9 @@ private void dumpBand() throws IOException { @@ -54,9 +54,9 @@ public void readDataFrom(InputStream in) throws IOException { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-02 21:14:28.392759448 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-02 21:34:27.812140950 +0100 -@@ -149,8 +149,13 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-13 14:10:44.847722836 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-13 14:45:23.573130411 +0000 +@@ -150,8 +150,13 @@ if ("--config-file=".equals(state)) { String propFile = av.remove(0); Properties fileProps = new Properties(); @@ -71,7 +71,7 @@ } if (engProps.get(verboseProp) != null) fileProps.list(System.out); -@@ -341,9 +346,14 @@ +@@ -342,9 +347,14 @@ else fileOut = new FileOutputStream(outfile); fileOut = new BufferedOutputStream(fileOut); @@ -87,7 +87,7 @@ } // At this point, we have a good jarfile (or newfile, if -r) } -@@ -404,7 +414,9 @@ +@@ -403,7 +413,9 @@ long filelen = new File(jarfile).length(); if (filelen <= 0) return ""; long skiplen = Math.max(0, filelen - tail.length); @@ -98,7 +98,7 @@ in.skip(skiplen); in.read(tail); for (int i = tail.length-4; i >= 0; i--) { -@@ -418,6 +430,9 @@ +@@ -417,6 +429,9 @@ } } return ""; @@ -109,9 +109,9 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2012-05-02 21:34:27.812140950 +0100 -@@ -241,9 +241,15 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2013-02-13 14:45:23.573130411 +0000 +@@ -245,9 +245,15 @@ void run(File inFile, JarOutputStream jstream) throws IOException { // %%% maybe memory-map the file, and pass it straight into unpacker ByteBuffer mappedFile = null; @@ -129,8 +129,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-05-02 21:34:27.812140950 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-13 14:45:23.573130411 +0000 @@ -540,9 +540,15 @@ Index index = initCPIndex(tag, cpMap); @@ -174,8 +174,8 @@ attr_definition_name.doneDisbursing(); attr_definition_layout.doneDisbursing(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-05-02 21:34:27.816141016 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-13 14:45:23.573130411 +0000 @@ -458,9 +458,15 @@ Utils.log.info("Writing "+cpMap.length+" "+ConstantPool.tagName(tag)+" entries..."); @@ -219,8 +219,8 @@ void writeAttrCounts() throws IOException { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-05-02 21:34:27.816141016 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-13 14:45:23.573130411 +0000 @@ -122,8 +122,9 @@ // Do this after the previous props are put in place, // to allow override if necessary. @@ -249,8 +249,8 @@ for (Map.Entry<Object, Object> e : props.entrySet()) { String key = (String) e.getKey(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-05-02 21:34:27.816141016 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-13 14:45:23.573130411 +0000 @@ -160,9 +160,15 @@ } // Use the stream-based implementation. @@ -269,8 +269,8 @@ in.delete(); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-05-02 21:34:27.816141016 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-13 14:45:23.573130411 +0000 @@ -268,18 +268,30 @@ // 4947205 : Peformance is slow when using pack-effort=0 out = new BufferedOutputStream(out); @@ -304,9 +304,29 @@ } // Wrapper to prevent closing of client-supplied stream. static private +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2013-02-13 14:45:23.585130603 +0000 +@@ -1401,10 +1401,14 @@ + java.net.URLConnection uconn = tClass.getResource(tResource).openConnection(); + int len = uconn.getContentLength(); + byte[] bytes = new byte[len]; +- try (java.io.InputStream str = uconn.getInputStream()) { ++ java.io.InputStream str = null; ++ try { ++ str = uconn.getInputStream(); + int nr = str.read(bytes); + if (nr != len) throw new java.io.IOException(tResource); +- } ++ } finally { ++ str.close(); ++ } + values[0] = bytes; + } catch (java.io.IOException ex) { + throw new InternalError(ex.toString()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2012-05-02 21:34:27.828141214 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2013-02-13 14:45:23.577130474 +0000 @@ -575,12 +575,23 @@ * Returns the Manifest for the specified JAR file name. */ @@ -335,8 +355,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java ---- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2012-05-02 21:34:27.828141214 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2013-02-13 14:45:23.577130474 +0000 @@ -188,7 +188,7 @@ } catch (Throwable suppressed) { x.addSuppressed(suppressed); @@ -347,8 +367,8 @@ assert sc.isConnected(); return sc; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2011-04-29 01:51:17.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2012-05-02 21:34:27.828141214 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2013-02-13 14:45:23.577130474 +0000 @@ -122,9 +122,15 @@ if (attrs.isDirectory()) { Files.createDirectory(target); @@ -376,8 +396,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java ---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2013-02-13 14:45:23.577130474 +0000 @@ -2833,8 +2833,11 @@ } @@ -491,8 +511,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java openjdk-boot/jdk/src/share/classes/java/util/Currency.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2012-03-18 17:19:55.667662249 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2013-02-13 14:45:23.577130474 +0000 @@ -233,9 +233,14 @@ "currency.properties"); if (propFile.exists()) { @@ -510,47 +530,28 @@ Pattern propertiesPattern = Pattern.compile("([A-Z]{3})\\s*,\\s*(\\d{3})\\s*,\\s*([0-3])"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2012-05-02 21:34:27.832141280 +0100 -@@ -376,9 +376,15 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2013-02-13 14:46:10.049877061 +0000 +@@ -383,9 +383,15 @@ + * META-INF files. */ private byte[] getBytes(ZipEntry ze) throws IOException { - byte[] b = new byte[(int)ze.getSize()]; -- try (DataInputStream is = new DataInputStream(super.getInputStream(ze))) { -+ DataInputStream is = null; +- try (InputStream is = super.getInputStream(ze)) { ++ InputStream is = null; + try { -+ is = new DataInputStream(super.getInputStream(ze)); - is.readFully(b, 0, b.length); ++ is = super.getInputStream(ze); + return IOUtils.readFully(is, (int)ze.getSize(), true); } -+ finally { -+ if (is != null) -+ is.close(); -+ } - return b; ++ finally { ++ if (is != null) ++ is.close(); ++ } } -@@ -480,11 +486,15 @@ - JarEntry manEntry = getManEntry(); - if (manEntry != null) { - byte[] b = new byte[(int)manEntry.getSize()]; -- try (DataInputStream dis = new DataInputStream( -- super.getInputStream(manEntry))) { -+ DataInputStream dis = null; -+ try { -+ dis = new DataInputStream(super.getInputStream(manEntry)); - dis.readFully(b, 0, b.length); - } -- -+ finally { -+ if (dis != null) -+ dis.close(); -+ } - int last = b.length - src.length; - int i = 0; - next: + /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2013-02-13 14:45:23.577130474 +0000 @@ -144,8 +144,9 @@ buf = new char[(int)len]; int read = 0; @@ -610,8 +611,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2013-02-13 14:45:23.577130474 +0000 @@ -367,9 +367,15 @@ // Load user's implementation of SyncProvider // here. -Drowset.properties=/abc/def/pqr.txt @@ -654,8 +655,8 @@ parseProperties(properties); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2011-06-11 00:38:10.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2013-02-13 14:45:23.577130474 +0000 @@ -194,7 +194,8 @@ * Given a URL, retrieves a JAR file, caches it to disk, and creates a * cached JAR file object. @@ -689,8 +690,8 @@ } }); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2011-06-11 00:38:10.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2013-02-13 14:45:23.581130538 +0000 @@ -255,7 +255,9 @@ this.entries = new HashMap<Path,CacheEntry>(); @@ -714,8 +715,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2011-06-11 00:38:10.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-02-13 14:45:23.581130538 +0000 @@ -92,9 +92,13 @@ tabName = filename; try { @@ -784,8 +785,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2011-06-11 00:38:10.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2013-02-13 14:45:23.581130538 +0000 @@ -179,7 +179,9 @@ // The temporary dir File f = new File(p.getProperty("java.io.tmpdir")); @@ -809,8 +810,8 @@ } catch (Exception ex) { md.update((byte)ex.hashCode()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-03-18 17:19:55.719663080 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-13 14:45:23.585130603 +0000 @@ -1149,9 +1149,14 @@ } else { ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -829,8 +830,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-02 21:14:28.512761362 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-02 21:34:27.836141346 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-13 14:10:44.939724315 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-13 14:45:23.585130603 +0000 @@ -56,8 +56,9 @@ private static void add(String alias, String pemCert) { @@ -864,8 +865,8 @@ static { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2012-03-18 17:19:55.723663143 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2013-02-13 14:45:23.585130603 +0000 @@ -99,14 +99,19 @@ } @@ -895,8 +896,8 @@ public static void usage() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2012-05-02 21:14:28.508761298 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2013-02-13 14:10:44.939724315 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2013-02-13 14:45:23.585130603 +0000 @@ -153,7 +153,9 @@ // Cast to HotSpotVirtualMachine as this is an // implementation specific method. @@ -921,8 +922,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2011-06-11 00:38:11.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2013-02-13 14:45:23.585130603 +0000 @@ -127,9 +127,15 @@ calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws IOException { @@ -941,8 +942,8 @@ } }); diff -Nru openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java ---- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2012-02-13 15:55:48.725932524 +0000 -+++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2013-02-13 14:45:23.585130603 +0000 @@ -200,7 +200,7 @@ } @@ -953,8 +954,8 @@ Character.UnicodeBlock currentBlock = Character.UnicodeBlock.of(0); for (int cp = 0x000001; cp < 0x110000; cp++ ) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2011-06-11 00:38:13.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-13 14:45:23.585130603 +0000 @@ -569,11 +569,11 @@ public Void run() throws BackingStoreException { Map<String, String> m = new TreeMap<>(); @@ -1018,8 +1019,8 @@ } }); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2011-06-11 00:38:13.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2012-05-02 21:34:27.832141280 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2013-02-11 23:13:31.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2013-02-13 14:45:23.585130603 +0000 @@ -255,9 +255,16 @@ String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties"; Path file = Paths.get(fstypes); @@ -1038,23 +1039,3 @@ } catch (IOException x) { } return result; -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 2012-10-17 03:17:03.331299684 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2012-10-17 03:18:04.192329905 +0100 -@@ -1401,10 +1401,14 @@ - java.net.URLConnection uconn = tClass.getResource(tResource).openConnection(); - int len = uconn.getContentLength(); - byte[] bytes = new byte[len]; -- try (java.io.InputStream str = uconn.getInputStream()) { -+ java.io.InputStream str = null; -+ try { -+ str = uconn.getInputStream(); - int nr = str.read(bytes); - if (nr != len) throw new java.io.IOException(tResource); -- } -+ } finally { -+ str.close(); -+ } - values[0] = bytes; - } catch (java.io.IOException ex) { - throw new InternalError(ex.toString());