Mercurial > hg > release > icedtea7-2.2
changeset 2548:099cd72b4611
Use 2.2 forest.
2012-05-23 Andrew John Hughes <ahughes@redhat.com>
Use 2.2 forest.
* Makefile.am:
(CORBA_CHANGESET): Update to 2.2 forest head.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PREFIX): Set to icedtea7-forest-2.2
(ICEDTEA_HG_URL): Point to 2.2 forest.
(extract-openjdk): Mirror replacement of '.' with
'-' done by Mercurial server when creating tarball.
* patches/boot/ecj-diamond.patch:
Adjust case in UntrustedCertificates.java.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 23 May 2012 19:59:19 +0100 |
| parents | bd698bdeb871 |
| children | d1be68ac65c5 |
| files | ChangeLog Makefile.am patches/boot/ecj-diamond.patch |
| diffstat | 3 files changed, 487 insertions(+), 462 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 23 17:59:53 2012 +0100 +++ b/ChangeLog Wed May 23 19:59:19 2012 +0100 @@ -1,3 +1,28 @@ +2012-05-23 Andrew John Hughes <ahughes@redhat.com> + + Use 2.2 forest. + * Makefile.am: + (CORBA_CHANGESET): Update to 2.2 forest head. + (HOTSPOT_CHANGESET): Likewise. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (ICEDTEA_PREFIX): Set to icedtea7-forest-2.2 + (ICEDTEA_HG_URL): Point to 2.2 forest. + (extract-openjdk): Mirror replacement of '.' with + '-' done by Mercurial server when creating tarball. + * patches/boot/ecj-diamond.patch: + Adjust case in UntrustedCertificates.java. + 2012-05-23 Andrew John Hughes <ahughes@redhat.com> * NEWS: Updated.
--- a/Makefile.am Wed May 23 17:59:53 2012 +0100 +++ b/Makefile.am Wed May 23 19:59:19 2012 +0100 @@ -4,21 +4,21 @@ JDK_UPDATE_VERSION = 04 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 113893003a77 -HOTSPOT_CHANGESET = 5be91de8b779 -JAXP_CHANGESET = 10808c0ac008 -JAXWS_CHANGESET = 06cd92271215 -JDK_CHANGESET = fd327c7e74da -LANGTOOLS_CHANGESET = 8634c8f95ff7 -OPENJDK_CHANGESET = 6670fad22684 +CORBA_CHANGESET = b165245a9c91 +HOTSPOT_CHANGESET = b11130d646c2 +JAXP_CHANGESET = a98d6a2f14a1 +JAXWS_CHANGESET = 78ae35b1ed35 +JDK_CHANGESET = ca871dbdbd7b +LANGTOOLS_CHANGESET = 2176128e2f57 +OPENJDK_CHANGESET = 8beaec91886d -CORBA_SHA256SUM = 3dafae04c00c8f13a7cbba0a8ad070bd10e4bec6598f27a62e34cdeb54ed4957 -HOTSPOT_SHA256SUM = babb11cf54c6299fe2f0730968316958b71a1dd5e7c2d5d698ac7d905bfc2ccc -JAXP_SHA256SUM = a8c600e3419d8586acb3f7f444bea399aac174d58f2127cb4c0a3ffd3cffdd17 -JAXWS_SHA256SUM = f896fbc4dd9eeb68015afe0378638fc646b9b08047cf9c382a33542f44454def -JDK_SHA256SUM = 4697250c0218be75bac9595e0345cff3bfb7a0f5bd0a9cf0544b75483aec9a1a -LANGTOOLS_SHA256SUM = bad80067828740510fe8f7c430dfb90d1ec1c895a93fa56b16d8223a8c757bd3 -OPENJDK_SHA256SUM = 5256c8e7c9144ff8a23e83574a82a42874c4c7722057e8194ceb70fe15a5de06 +CORBA_SHA256SUM = 51d173f91fd719ead1a7e9ba37a58601c6bc294e45274b0d00e7691faa73a3f8 +HOTSPOT_SHA256SUM = f1295ad94fd3e5ba3a880703ce97b2e4274c4c3b0fc7f23ef9a3eb9de3043d31 +JAXP_SHA256SUM = 16e23d8a721fa7e5fc0ca4c83f8a0cc300a2b6f2682597b48e31ca18d2e05ae3 +JAXWS_SHA256SUM = ab49c561624694504aeafe0996a760c577b50c21c89eb741932e3ec22c0ec426 +JDK_SHA256SUM = 0db1a01ce9035032854c6f8d76403d4edf8bb76f0afa31377f400063f4a18df8 +LANGTOOLS_SHA256SUM = b277f274fe5c830dbb735d0193bdb739bd4d716c00891cc1e58c25a0dd97c567 +OPENJDK_SHA256SUM = 087ff5687b568ab2395eedef1310edd940259425ce385573ccb2c0406db13062 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 @@ -32,8 +32,8 @@ JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz -ICEDTEA_PREFIX = icedtea7-forest -ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) +ICEDTEA_PREFIX = icedtea7-forest-2.2 +ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX) OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/ @@ -1104,7 +1104,7 @@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ esac; \ - mv $(ICEDTEA_PREFIX)-$(OPENJDK_CHANGESET) openjdk ; \ + mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ else \ echo "ERROR: Couldn't extract OpenJDK"; \ false; \
--- a/patches/boot/ecj-diamond.patch Wed May 23 17:59:53 2012 +0100 +++ b/patches/boot/ecj-diamond.patch Wed May 23 19:59:19 2012 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-03-22 11:28:14.027881166 +0000 +--- 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 @@ -103,9 +103,9 @@ return this.def.compareTo(that.def); } @@ -72,8 +72,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-03-22 11:18:05.190037791 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-03-22 11:28:14.047881492 +0000 +--- 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 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -142,8 +142,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-03-22 11:18:05.066035805 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-03-22 11:28:14.047881492 +0000 +--- 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 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -154,8 +154,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-03-22 11:28:14.047881492 +0000 +--- 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 @@ -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 +192,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-03-22 11:28:14.047881492 +0000 +--- 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 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -204,8 +204,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-03-22 11:28:14.047881492 +0000 +--- 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 @@ -915,7 +915,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -234,8 +234,8 @@ Entry e = work.previous(); work.remove(); // pop stack diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-03-22 11:18:05.190037791 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-03-22 11:28:14.047881492 +0000 +--- 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 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -273,8 +273,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-03-22 11:28:14.047881492 +0000 +--- 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 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -285,8 +285,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -126,11 +126,11 @@ public void setBytes(byte[] newBytes) { if (bytes == newBytes) return; @@ -311,8 +311,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-03-22 11:18:05.070035870 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -477,8 +477,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-03-22 11:18:05.194037856 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -592,8 +592,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-03-22 11:18:05.194037856 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -649,8 +649,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -181,8 +181,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -681,8 +681,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -693,8 +693,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-03-22 11:18:05.194037856 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -47,8 +47,8 @@ */ @@ -716,8 +716,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -738,8 +738,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-03-22 11:18:05.194037856 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -232,7 +232,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -750,8 +750,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-03-22 11:18:05.194037856 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-03-22 11:28:14.051881557 +0000 +--- 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 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -762,8 +762,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -1284,7 +1284,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -783,8 +783,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -795,8 +795,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -811,8 +811,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -152,7 +152,7 @@ // new configuration @@ -841,8 +841,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -853,8 +853,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -865,8 +865,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -877,8 +877,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -889,8 +889,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -901,8 +901,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -913,8 +913,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -95,7 +95,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -925,8 +925,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -42,7 +42,7 @@ */ final class ThreadGroupContext { @@ -946,8 +946,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-03-22 11:28:14.055881623 +0000 +--- 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 @@ -34,7 +34,7 @@ */ @@ -967,8 +967,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -57,7 +57,7 @@ private volatile boolean closed = false; @@ -979,8 +979,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -1082,7 +1082,7 @@ if ((names == null) || (filter == null)) { return names; @@ -1009,8 +1009,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -70,7 +70,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -1021,8 +1021,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -725,7 +725,7 @@ */ @@ -1051,8 +1051,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -213,7 +213,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -1077,8 +1077,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -165,11 +165,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1103,8 +1103,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -84,18 +84,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1185,8 +1185,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -47,7 +47,7 @@ } } @@ -1197,8 +1197,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1219,8 +1219,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2012-03-22 11:28:14.059881688 +0000 +--- 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 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1231,8 +1231,8 @@ 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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -1327,8 +1327,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -246,7 +246,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1412,7 +1412,7 @@ // The paths searched for libraries private static String usr_paths[]; -@@ -2097,8 +2101,8 @@ +@@ -2108,8 +2112,8 @@ * them to empty maps, effectively ignoring any present settings. */ synchronized (assertionLock) { @@ -1423,7 +1423,7 @@ defaultAssertionStatus = false; } } -@@ -2160,8 +2164,8 @@ +@@ -2171,8 +2175,8 @@ private void initializeJavaAssertionMaps() { // assert Thread.holdsLock(assertionLock); @@ -1435,8 +1435,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -1478,8 +1478,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-03-22 11:18:05.138036959 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -1490,8 +1490,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -1529,8 +1529,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-03-22 11:18:05.198037920 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -596,13 +596,16 @@ } @@ -1552,8 +1552,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1573,8 +1573,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -136,7 +136,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1585,8 +1585,8 @@ exceptionTypes, modifiers, slot, signature, diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ /** maps a class loader to the proxy class cache for that loader */ @@ -1615,8 +1615,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1627,8 +1627,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -1642,8 +1642,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -2330,7 +2330,7 @@ int off = 0; int next = 0; @@ -1654,8 +1654,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2012-03-22 11:28:14.063881753 +0000 +--- 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 @@ -1616,7 +1616,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -1681,8 +1681,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -917,7 +917,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -1702,8 +1702,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -677,7 +677,7 @@ static InetAddressImpl impl; @@ -1723,8 +1723,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -205,7 +205,7 @@ */ @@ -1735,8 +1735,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-03-22 11:18:05.198037920 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2012-03-22 11:28:26.992092657 +0000 +--- 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 @@ -1487,7 +1487,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -1756,8 +1756,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -124,7 +124,7 @@ this.context = null; } @@ -1768,8 +1768,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -1780,8 +1780,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -1805,8 +1805,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -1826,8 +1826,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -1847,8 +1847,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -368,8 +368,8 @@ int swag = 32; int vcap = 8; @@ -1861,8 +1861,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -1891,8 +1891,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -1903,8 +1903,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -1951,8 +1951,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -1990,8 +1990,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2012-03-22 11:28:14.067881818 +0000 +--- 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 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -2002,8 +2002,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -2033,8 +2033,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -2045,8 +2045,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -2672,8 +2672,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -2684,8 +2684,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -2708,8 +2708,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-03-22 11:18:05.138036959 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -2720,8 +2720,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -763,7 +763,7 @@ */ void addEntry(int hash, K key, V value, int bucketIndex) { @@ -2741,8 +2741,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -2789,8 +2789,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2012-03-22 11:28:14.071881884 +0000 +--- 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 @@ -455,7 +455,7 @@ // Creates the new entry. @@ -2846,8 +2846,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -2867,8 +2867,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -2879,8 +2879,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -237,7 +237,7 @@ * the chain. */ @@ -2900,8 +2900,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -2939,8 +2939,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -187,7 +187,7 @@ return; @@ -2951,8 +2951,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -2963,8 +2963,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -2975,8 +2975,8 @@ // A metered stream is a subclass of OutputStream that // (a) forwards all its output to a target stream diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ */ @@ -2987,8 +2987,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -170,7 +170,7 @@ private LogManager manager; private String name; @@ -3008,8 +3008,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -3020,8 +3020,8 @@ for (; loggers.hasMoreElements();) { array.add((String) loggers.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2012-03-22 11:28:14.075881949 +0000 +--- 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; @@ -3060,8 +3060,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -3073,8 +3073,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -3105,8 +3105,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -538,7 +538,7 @@ cursor--; else { @@ -3117,8 +3117,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2012-03-22 11:28:14.075881949 +0000 +--- 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 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -3129,8 +3129,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -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 +3168,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -193,8 +193,8 @@ } }; @@ -3182,8 +3182,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -3194,8 +3194,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -289,7 +289,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -3260,8 +3260,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3290,8 +3290,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3302,8 +3302,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3359,8 +3359,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3428,8 +3428,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -171,7 +171,7 @@ /** * Reference queue for cleared WeakEntries @@ -3462,8 +3462,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -319,7 +319,7 @@ // the outstanding inputstreams that need to be closed, @@ -3492,8 +3492,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -53,8 +53,8 @@ } @@ -3506,8 +3506,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -3518,8 +3518,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -3530,8 +3530,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2012-03-22 11:28:14.079882014 +0000 +--- 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 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -3542,8 +3542,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -48,7 +48,7 @@ private Subject subject; @@ -3554,8 +3554,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-03-22 11:18:05.238038559 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -59,7 +59,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap[n]; // unchecked warning expected here @@ -3593,8 +3593,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -3605,8 +3605,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -3617,8 +3617,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-03-22 11:18:05.070035870 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -169,7 +169,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -3638,8 +3638,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -3650,8 +3650,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -3680,8 +3680,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -3692,8 +3692,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -2628,7 +2628,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -3713,8 +3713,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -239,7 +239,7 @@ url = null; } @@ -3725,8 +3725,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -3764,8 +3764,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -3776,8 +3776,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -3790,8 +3790,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -3802,8 +3802,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -77,7 +77,7 @@ throws IOException { @@ -3823,8 +3823,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -71,7 +71,7 @@ @Override @@ -3835,8 +3835,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -3856,8 +3856,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2012-03-22 11:28:14.083882079 +0000 +--- 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 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -3922,8 +3922,8 @@ 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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ /** maps activation id to its respective group id */ @@ -3951,8 +3951,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -3963,8 +3963,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -41,15 +41,15 @@ // or principal. // @@ -4005,8 +4005,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -4026,8 +4026,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -4065,8 +4065,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -40,7 +40,7 @@ public class Providers { @@ -4077,8 +4077,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -267,7 +267,7 @@ if (ktabs.isEmpty()) { return kk.toArray(new KerberosKey[kk.size()]); @@ -4089,8 +4089,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -551,7 +551,7 @@ } }))); @@ -4168,8 +4168,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4180,8 +4180,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4192,8 +4192,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -490,7 +490,7 @@ private static String exec(String c) { @@ -4204,8 +4204,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -257,7 +257,7 @@ + configName); } @@ -4216,8 +4216,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4228,8 +4228,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -4249,8 +4249,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -4279,8 +4279,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4291,8 +4291,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4303,8 +4303,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4315,8 +4315,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -259,7 +259,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -4327,8 +4327,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-03-22 11:18:05.206038048 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -4366,8 +4366,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -77,7 +77,7 @@ */ @@ -4378,8 +4378,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2012-03-22 11:28:14.087882145 +0000 +--- 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 @@ -462,7 +462,7 @@ */ static class KdcAccessibility { @@ -4402,8 +4402,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -238,7 +238,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4423,8 +4423,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -359,14 +359,14 @@ } @@ -4443,8 +4443,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -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 +4455,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -4467,8 +4467,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -4524,8 +4524,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -4536,8 +4536,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4548,8 +4548,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -4595,8 +4595,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -219,7 +219,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -4607,8 +4607,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4619,8 +4619,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -393,7 +393,7 @@ // Map BulkCipher -> Boolean(available) @@ -4631,8 +4631,8 @@ // descriptive name including key size, e.g. AES/128 final String description; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -4661,8 +4661,8 @@ if (suite != CipherSuite.C_SCSV) { cipherList.add(suite); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2012-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -4700,8 +4700,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -569,7 +569,7 @@ activeProtocols = getActiveProtocols(); } @@ -4721,8 +4721,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -169,7 +169,7 @@ return name; } @@ -4742,8 +4742,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -4754,8 +4754,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2012-03-22 11:28:14.091882210 +0000 +--- 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 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -4793,8 +4793,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -261,7 +261,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -4841,8 +4841,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -325,7 +325,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -4861,18 +4861,18 @@ AccessController.doPrivileged( new PrivilegedExceptionAction<Object>() { public Object run() throws Exception { -@@ -771,7 +771,7 @@ - private final X509TrustManager tm; - - // Cache the trusted certificate to optimize the performance. -- private final Collection<X509Certificate> trustedCerts = new HashSet<>(); -+ private final Collection<X509Certificate> trustedCerts = new HashSet<X509Certificate>(); - - AbstractTrustManagerWrapper(X509TrustManager tm) { - this.tm = tm; +@@ -913,7 +913,7 @@ + // Does the certificate chain end with a trusted certificate? + int checkedLength = chain.length - 1; + +- Collection<X509Certificate> trustedCerts = new HashSet<>(); ++ Collection<X509Certificate> trustedCerts = new HashSet<X509Certificate>(); + X509Certificate[] certs = tm.getAcceptedIssuers(); + 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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -618,7 +618,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -4892,8 +4892,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -2478,7 +2478,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -4904,8 +4904,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -4925,8 +4925,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -4937,8 +4937,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -4958,8 +4958,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -123,14 +123,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -5041,8 +5041,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-03-22 11:18:05.210038112 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -5058,7 +5058,7 @@ enum Command { CERTREQ("Generates.a.certificate.request", -@@ -2092,7 +2092,7 @@ +@@ -2093,7 +2093,7 @@ */ public static List<CRL> readCRLsFromCert(X509Certificate cert) throws Exception { @@ -5067,7 +5067,7 @@ CRLDistributionPointsExtension ext = X509CertImpl.toImpl(cert).getCRLDistributionPointsExtension(); if (ext == null) return crls; -@@ -2259,7 +2259,7 @@ +@@ -2260,7 +2260,7 @@ if (jarfile != null) { JarFile jf = new JarFile(jarfile, true); Enumeration<JarEntry> entries = jf.entries(); @@ -5076,7 +5076,7 @@ byte[] buffer = new byte[8192]; int pos = 0; while (entries.hasMoreElements()) { -@@ -3359,7 +3359,7 @@ +@@ -3360,7 +3360,7 @@ } // start building chain @@ -5085,7 +5085,7 @@ if (buildChain((X509Certificate)certToVerify, chain, certs)) { Certificate[] newChain = new Certificate[chain.size()]; // buildChain() returns chain with self-signed root-cert first and -@@ -3885,7 +3885,7 @@ +@@ -3886,7 +3886,7 @@ break; case 2: // EKU if(value != null) { @@ -5094,7 +5094,7 @@ for (String s: value.split(",")) { int p = oneOf(s, "anyExtendedKeyUsage", -@@ -3955,7 +3955,7 @@ +@@ -3956,7 +3956,7 @@ } if(value != null) { List<AccessDescription> accessDescriptions = @@ -5103,7 +5103,7 @@ String[] ps = value.split(","); for(String item: ps) { colonpos = item.indexOf(':'); -@@ -4239,7 +4239,7 @@ +@@ -4240,7 +4240,7 @@ } public static <A,B> Pair<A,B> of(A a, B b) { @@ -5113,8 +5113,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -5151,9 +5151,21 @@ public TaggedList(int i, boolean b) { 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 +@@ -42,7 +42,7 @@ + */ + public final class UntrustedCertificates { + +- private final static Set<X509Certificate> untrustedCerts = new HashSet<>(); ++ private final static Set<X509Certificate> untrustedCerts = new HashSet<X509Certificate>(); + + /** + * Checks if a certificate is untrusted. 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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2012-03-22 11:28:14.095882275 +0000 +--- 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 @@ -94,7 +94,7 @@ * Run the converter */ @@ -5164,8 +5176,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -5280,8 +5292,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -5337,8 +5349,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -81,7 +81,7 @@ } @@ -5366,8 +5378,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -5404,8 +5416,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -5425,8 +5437,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -113,7 +113,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -5455,8 +5467,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -160,7 +160,7 @@ } @@ -5491,8 +5503,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -5505,8 +5517,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -134,7 +134,7 @@ throws IOException { @@ -5517,8 +5529,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -157,7 +157,7 @@ @Override @@ -5619,8 +5631,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -5631,8 +5643,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -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. @@ -5643,8 +5655,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-03-22 11:18:05.218038239 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -5709,8 +5721,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -5730,8 +5742,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -153,12 +153,12 @@ static { @@ -5750,8 +5762,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -5771,8 +5783,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -5783,8 +5795,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -5795,8 +5807,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2012-03-22 11:28:14.099882340 +0000 +--- 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 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -5816,8 +5828,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -83,7 +83,7 @@ } @@ -5828,8 +5840,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -5840,8 +5852,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -5863,8 +5875,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -5875,8 +5887,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -128,7 +128,7 @@ } @@ -5887,8 +5899,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -5899,8 +5911,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -5911,8 +5923,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -5959,8 +5971,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -5971,8 +5983,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -5983,8 +5995,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -5995,8 +6007,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -103,7 +103,7 @@ } } @@ -6007,8 +6019,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -6019,8 +6031,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-03-21 17:09:55.000000000 +0000 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2012-03-22 11:28:14.103882406 +0000 +--- 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 @@ -59,7 +59,7 @@ } } @@ -6030,15 +6042,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/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-02 20:54:14.597408672 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-05-02 20:54:23.977558137 +0100 -@@ -42,7 +42,7 @@ - */ - public final class UntrustedCertificates { - -- private final static Set<X509Certificate> untrustedCerts = new HashSet<>(); -+ private final static Set<X509Certificate> untrustedCerts = new HashSet<X509Certificate>(); - - /** - * Checks if a certificate is untrusted.