Mercurial > hg > icedtea7
changeset 2597:67d42446bc25
Update to u10b08.
2012-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
(OPENJDK_VERSION): Bump to b08.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* hotspot.map: Update default to head of IcedTea7
forest HotSpot.
* patches/boot/ecj-diamond.patch:
Regenerated. Added new cases in javax.crypto.CryptoPermissions,
javax.crypto.JceSecurityManager and java.beans.Introspector.
* patches/boot/ecj-multicatch.patch:
Added new case in sun.tools.jconsole.Resources.
* patches/boot/ecj-stringswitch.patch:
Regenerated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 26 Sep 2012 14:52:49 +0100 |
| parents | 1603e47bf631 |
| children | 86d2b1dac5ce d8cfcb34720f |
| files | ChangeLog Makefile.am hotspot.map patches/boot/ecj-diamond.patch patches/boot/ecj-multicatch.patch patches/boot/ecj-stringswitch.patch |
| diffstat | 6 files changed, 676 insertions(+), 577 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Sep 25 14:34:52 2012 +0200 +++ b/ChangeLog Wed Sep 26 14:52:49 2012 +0100 @@ -1,3 +1,29 @@ +2012-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am: + (OPENJDK_VERSION): Bump to b08. + (CORBA_CHANGESET): Update to IcedTea7 forest head. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: Update default to head of IcedTea7 + forest HotSpot. + * patches/boot/ecj-diamond.patch: + Regenerated. Added new cases in javax.crypto.CryptoPermissions, + javax.crypto.JceSecurityManager and java.beans.Introspector. + * patches/boot/ecj-multicatch.patch: + Added new case in sun.tools.jconsole.Resources. + * patches/boot/ecj-stringswitch.patch: + Regenerated. + 2012-09-25 Xerxes Rånby <xerxes@zafena.se> JamVM
--- a/Makefile.am Tue Sep 25 14:34:52 2012 +0200 +++ b/Makefile.am Wed Sep 26 14:52:49 2012 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b07 +OPENJDK_VERSION = b08 JDK_UPDATE_VERSION = 10 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 460b8758b9e4 -JAXP_CHANGESET = 5022489661f3 -JAXWS_CHANGESET = cf12218e2d86 -JDK_CHANGESET = 7458205a24cb -LANGTOOLS_CHANGESET = b6aa87579acb -OPENJDK_CHANGESET = d6cfb4b87935 +CORBA_CHANGESET = 7b663d107703 +JAXP_CHANGESET = 5534e1a3b332 +JAXWS_CHANGESET = b75161fe3bd2 +JDK_CHANGESET = 1c47442c7584 +LANGTOOLS_CHANGESET = 1045d2bf8428 +OPENJDK_CHANGESET = fc2e81562d86 -CORBA_SHA256SUM = a9f997e9b8b530a8155505bbb0ef83a2aac5cdea120f87196172f1402f98018c -JAXP_SHA256SUM = efc733f72384008e3bb095420964b671eeecba02e7003bb50355e835f2495bf3 -JAXWS_SHA256SUM = 3aae6d0d757c460b4d9a5cbebf722fc81192d1dcebd25d4c709fe6b03c12d48d -JDK_SHA256SUM = 9602aaa77634a7750afc63f65334ae26efc2b38ef822552e77cef456d681cb97 -LANGTOOLS_SHA256SUM = 166a06f7a56b5ae0eeb51d07b634e95e1c9c541875ea7ec3e529b72172cf875b -OPENJDK_SHA256SUM = 237b638ca0a210524ae719c96d18909ab951830081078f842ce3afa5fd20b39d +CORBA_SHA256SUM = 2c828476f2cfd1a9e3a5be7abf307c2087829ef6be626ae6b00f8c5eaf021760 +JAXP_SHA256SUM = e09f10dd7bac6ddd92016cf2397dea8a8b704dbfa0f27ca99f1a6de080412a7d +JAXWS_SHA256SUM = b08dcd8f4796daab11b13417b036de4323bed79e8c790ad958a55a1a165f08b8 +JDK_SHA256SUM = f758775982b021f6e650d1092a9f5d9bd900311603207c2ff51eb99fd4b2b731 +LANGTOOLS_SHA256SUM = f3e06606db1725548d4b67ff7f1db4e07ed291a46ac99a3149df6e82bd508945 +OPENJDK_SHA256SUM = c107253e6ca56e07c65f7656a47ae04cd53a061de9b8a302552be44cc65d1394 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
--- a/hotspot.map Tue Sep 25 14:34:52 2012 +0200 +++ b/hotspot.map Wed Sep 26 14:52:49 2012 +0100 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 08596d5d7dda c88abf4d9ab315e48a790ae184201efcd9b659c292b27570e3e606db585f2073 +default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot ede14825dbfa 3862e81ac99c464fda6f53898129ddbd1d62af63b7fc3ea06d21c4c9691da72e zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot c159737dd826 c1e626ecf4e7118ac269923ef0b83f5f8d36b0e816b293197ffbf8dd5083fa8d
--- a/patches/boot/ecj-diamond.patch Tue Sep 25 14:34:52 2012 +0200 +++ b/patches/boot/ecj-diamond.patch Wed Sep 26 14:52:49 2012 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-08-29 13:24:52.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-08-29 13:51:21.597693973 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-09-24 21:55:46.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-09-26 02:21:47.741128089 +0100 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-29 13:24:52.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-29 13:51:21.605694085 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-09-24 21:55:46.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-09-26 02:21:47.753128270 +0100 @@ -1316,7 +1316,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set<ObjectAdapterFactory> oaset; @@ -23,8 +23,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-08-29 13:24:52.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-08-29 13:51:21.605694085 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-09-24 21:55:46.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-09-26 02:21:47.753128270 +0100 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -44,8 +44,8 @@ for (WorkerThread wt : copy) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-08-29 13:52:15.526449232 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-09-26 02:21:47.753128270 +0100 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -65,9 +65,9 @@ CACHE.put(actual, map); } 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-08-29 13:51:21.605694085 +0100 -@@ -103,9 +103,9 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-09-26 02:21:47.753128270 +0100 +@@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -80,7 +80,7 @@ // Canonicalized lists of trivial attrs (Deprecated, etc.) // are used by trimToSize, in order to reduce footprint -@@ -115,7 +115,7 @@ +@@ -116,7 +116,7 @@ synchronized (canonLists) { List<Attribute> cl = canonLists.get(al); if (cl == null) { @@ -89,7 +89,7 @@ cl.addAll(al); cl = Collections.unmodifiableList(cl); canonLists.put(al, cl); -@@ -336,9 +336,9 @@ +@@ -337,9 +337,9 @@ public void addAttribute(Attribute a) { if (attributes == null) @@ -101,7 +101,7 @@ attributes.add(a); } -@@ -346,7 +346,7 @@ +@@ -347,7 +347,7 @@ if (attributes == null) return null; if (!attributes.contains(a)) return null; if (!(attributes instanceof ArrayList)) @@ -138,8 +138,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-08-29 13:50:51.345270734 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-09-26 02:24:51.519895668 +0100 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -169,7 +169,7 @@ // Well-known attributes: protected final Attribute.Layout attrCodeEmpty; -@@ -1713,16 +1713,16 @@ +@@ -1713,11 +1713,11 @@ protected final Attribute.Layout attrConstantValue; // Mapping from Attribute.Layout to Integer (inverse of attrDefs) @@ -183,15 +183,9 @@ { for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { assert(attrIndexLimit[i] == 0); - attrIndexLimit[i] = 32; // just for the sake of predefs. -- attrDefs.set(i, new ArrayList<>(Collections.nCopies( -+ attrDefs.set(i, new ArrayList<Attribute.Layout>(Collections.nCopies( - attrIndexLimit[i], (Attribute.Layout)null))); - - } @@ -1912,7 +1912,7 @@ - protected List<Attribute.Layout> getPredefinedAttrs(int ctype) { + protected List getPredefinedAttrs(int ctype) { assert(attrIndexLimit[ctype] != 0); - List<Attribute.Layout> res = new ArrayList<>(attrIndexLimit[ctype]); + List<Attribute.Layout> res = new ArrayList<Attribute.Layout>(attrIndexLimit[ctype]); @@ -208,8 +202,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-08-29 13:50:51.209268832 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-09-26 02:14:39.310725828 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-09-26 02:21:47.753128270 +0100 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -220,8 +214,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-09-26 02:21:47.753128270 +0100 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -258,8 +252,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-09-26 02:21:47.753128270 +0100 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -270,9 +264,9 @@ 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-08-29 13:51:21.609694141 +0100 -@@ -915,7 +915,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-09-26 02:21:47.753128270 +0100 +@@ -919,7 +919,7 @@ public static Index[] partition(Index ix, int[] keys) { // %%% Should move this into class Index. @@ -281,7 +275,7 @@ Entry[] cpMap = ix.cpMap; assert(keys.length == cpMap.length); for (int i = 0; i < keys.length; i++) { -@@ -926,7 +926,7 @@ +@@ -930,7 +930,7 @@ } List<Entry> part = parts.get(key); if (part == null) { @@ -290,7 +284,7 @@ } part.add(cpMap[i]); } -@@ -1133,7 +1133,7 @@ +@@ -1137,7 +1137,7 @@ void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) { cpRefs.remove(null); for (ListIterator<Entry> work = @@ -300,8 +294,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-08-29 13:50:51.345270734 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-09-26 02:21:47.753128270 +0100 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -339,8 +333,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-09-26 02:21:47.753128270 +0100 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -350,35 +344,9 @@ // initialize the list to null 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-08-29 13:51:21.609694141 +0100 -@@ -126,11 +126,11 @@ - public void setBytes(byte[] newBytes) { - if (bytes == newBytes) return; - ArrayList<Fixup> old = null; -- assert((old = new ArrayList<>(this)) != null); -+ assert((old = new ArrayList<Fixup>(this)) != null); - if (bytes == null || newBytes == null) { - // One or the other representations is deficient. - // Construct a checkpoint. -- ArrayList<Fixup> save = new ArrayList<>(this); -+ ArrayList<Fixup> save = new ArrayList<Fixup>(this); - clear(); - bytes = newBytes; - addAll(save); -@@ -138,7 +138,7 @@ - // assume newBytes is some sort of bitwise copy of the old bytes - bytes = newBytes; - } -- assert(old.equals(new ArrayList<>(this))); -+ assert(old.equals(new ArrayList<Fixup>(this))); - } - - 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-08-29 13:50:51.209268832 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-09-26 02:14:39.314725887 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-09-26 02:25:05.996114187 +0100 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -397,7 +365,7 @@ public List<Package.Class> getClasses() { return classes; -@@ -263,7 +263,7 @@ +@@ -264,7 +264,7 @@ if (olda == null) return; // no SourceFile attr. String obvious = getObviousSourceFile(); @@ -406,7 +374,7 @@ olda.visitRefs(this, VRM_PACKAGE, ref); Utf8Entry sfName = (Utf8Entry) ref.get(0); Attribute a = olda; -@@ -291,7 +291,7 @@ +@@ -292,7 +292,7 @@ if (a != olda) { if (verbose > 2) Utils.log.fine("recoding obvious SourceFile="+obvious); @@ -415,7 +383,7 @@ int where = newAttrs.indexOf(olda); newAttrs.set(where, a); setAttributes(newAttrs); -@@ -321,7 +321,7 @@ +@@ -322,7 +322,7 @@ } public void setInnerClasses(Collection<InnerClass> ics) { @@ -424,7 +392,7 @@ // Edit the attribute list, if necessary. Attribute a = getAttribute(attrInnerClassesEmpty); if (innerClasses != null && a == null) -@@ -340,7 +340,7 @@ +@@ -341,7 +341,7 @@ * with that of Package.this.allInnerClasses. */ public List<InnerClass> computeGloballyImpliedICs() { @@ -433,7 +401,7 @@ { // This block temporarily displaces this.innerClasses. ArrayList<InnerClass> innerClassesSaved = innerClasses; innerClasses = null; // ignore for the moment -@@ -349,7 +349,7 @@ +@@ -350,7 +350,7 @@ } ConstantPool.completeReferencesIn(cpRefs, true); @@ -442,7 +410,7 @@ for (Entry e : cpRefs) { // Restrict cpRefs to InnerClasses entries only. if (!(e instanceof ClassEntry)) continue; -@@ -365,7 +365,7 @@ +@@ -366,7 +366,7 @@ // This loop is structured this way so as to accumulate // entries into impliedICs in an order which reflects // the order of allInnerClasses. @@ -451,7 +419,7 @@ for (InnerClass ic : allInnerClasses) { // This one is locally relevant if it describes // a member of the current class, or if the current -@@ -408,8 +408,8 @@ +@@ -409,8 +409,8 @@ // Diff is A since I is empty. } // (I*A) is non-trivial @@ -462,7 +430,7 @@ impliedICs.addAll(actualICs); impliedICs.removeAll(center); // Diff is now I^A = (I+A)-(I*A). -@@ -538,7 +538,7 @@ +@@ -539,7 +539,7 @@ super(flags, descriptor); assert(!descriptor.isMethod()); if (fields == null) @@ -471,7 +439,7 @@ boolean added = fields.add(this); assert(added); order = fields.size(); -@@ -563,7 +563,7 @@ +@@ -564,7 +564,7 @@ super(flags, descriptor); assert(descriptor.isMethod()); if (methods == null) @@ -480,7 +448,7 @@ boolean added = methods.add(this); assert(added); } -@@ -728,14 +728,14 @@ +@@ -732,14 +732,14 @@ } // What non-class files are in this unit? @@ -497,25 +465,16 @@ for (Class cls : classes) { assert(cls.file.isClassStub()); classStubs.add(cls.file); -@@ -749,7 +749,7 @@ - int modtime = NO_MODTIME; - int options = 0; // random flag bits, such as deflate_hint - Class stubClass; // if this is a stub, here's the class -- ArrayList<byte[]> prepend = new ArrayList<>(); // list of byte[] -+ ArrayList<byte[]> prepend = new ArrayList<byte[]>(); // list of byte[] - java.io.ByteArrayOutputStream append = new ByteArrayOutputStream(); - - File(Utf8Entry name) { -@@ -852,7 +852,7 @@ +@@ -859,7 +859,7 @@ public InputStream getInputStream() { InputStream in = new ByteArrayInputStream(append.toByteArray()); if (prepend.isEmpty()) return in; - List<InputStream> isa = new ArrayList<>(prepend.size()+1); + List<InputStream> isa = new ArrayList<InputStream>(prepend.size()+1); - for (byte[] bytes : prepend) { + for (Iterator i = prepend.iterator(); i.hasNext(); ) { + byte[] bytes = (byte[]) i.next(); isa.add(new ByteArrayInputStream(bytes)); - } -@@ -888,7 +888,7 @@ +@@ -896,7 +896,7 @@ } // Is there a globally declared table of inner classes? @@ -524,7 +483,7 @@ Map<ClassEntry, InnerClass> allInnerClassesByThis; public -@@ -903,7 +903,7 @@ +@@ -911,7 +911,7 @@ allInnerClasses.addAll(ics); // Make an index: @@ -533,7 +492,7 @@ for (InnerClass ic : allInnerClasses) { Object pic = allInnerClassesByThis.put(ic.thisClass, ic); assert(pic == null); // caller must ensure key uniqueness! -@@ -1290,7 +1290,7 @@ +@@ -1302,7 +1302,7 @@ // Use this before writing the class files. void ensureAllClassFiles() { @@ -543,8 +502,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-08-29 13:50:51.349270790 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-09-26 02:23:17.530478725 +0100 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -631,15 +590,15 @@ bits = attrBits; // iterate again for (int ai = 0; bits != 0; ai++) { @@ -1596,7 +1596,7 @@ - void readAttrs(int ctype, Collection<? extends Attribute.Holder> holders) - throws IOException { + @SuppressWarnings("unchecked") + void readAttrs(int ctype, Collection holders) throws IOException { // Decode band values into attributes. - Set<Attribute.Layout> sawDefs = new HashSet<>(); + Set<Attribute.Layout> sawDefs = new HashSet<Attribute.Layout>(); ByteArrayOutputStream buf = new ByteArrayOutputStream(); - for (final Attribute.Holder h : holders) { - if (h.attributes == null) continue; -@@ -1799,7 +1799,7 @@ + for (Iterator i = holders.iterator(); i.hasNext(); ) { + final Attribute.Holder h = (Attribute.Holder) i.next(); +@@ -1800,7 +1800,7 @@ // scratch buffer for collecting code:: byte[] buf = new byte[1<<12]; // record of all switch opcodes (these are variable-length) @@ -648,7 +607,7 @@ for (int k = 0; k < allCodes.length; k++) { Code c = allCodes[k]; scanOneMethod: -@@ -1915,7 +1915,7 @@ +@@ -1916,7 +1916,7 @@ Set<Entry> ldcRefSet = ldcRefMap.get(curClass); if (ldcRefSet == null) @@ -658,8 +617,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-08-29 13:50:51.349270790 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-09-26 02:23:02.806257037 +0100 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -678,16 +637,16 @@ int bestCount = 0; int bestVersion = -1; for (Class cls : pkg.classes) { -@@ -728,7 +728,7 @@ - +@@ -729,7 +729,7 @@ + @SuppressWarnings("unchecked") void collectAttributeLayouts() { maxFlags = new int[ATTR_CONTEXT_LIMIT]; - allLayouts = new FixedList<>(ATTR_CONTEXT_LIMIT); -+ allLayouts = new FixedList<Map<Attribute.Layout,int[]>>(ATTR_CONTEXT_LIMIT); ++ allLayouts = new FixedList<Map<Attribute.Layout, int[]>>(ATTR_CONTEXT_LIMIT); for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { allLayouts.set(i, new HashMap<Attribute.Layout, int[]>()); } -@@ -773,7 +773,7 @@ +@@ -774,7 +774,7 @@ } // Collect counts for both predefs. and custom defs. // Decide on custom, local attribute definitions. @@ -696,16 +655,16 @@ attrCounts = new int[ATTR_CONTEXT_LIMIT][]; for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { // Now the remaining defs in allLayouts[i] need attr. indexes. -@@ -888,7 +888,7 @@ - Attribute.Layout[] attrDefsWritten; - +@@ -889,7 +889,7 @@ + + @SuppressWarnings("unchecked") void writeAttrDefs() throws IOException { - List<Object[]> defList = new ArrayList<>(); + List<Object[]> defList = new ArrayList<Object[]>(); for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { int limit = attrDefs.get(i).size(); for (int j = 0; j < limit; j++) { -@@ -1005,7 +1005,7 @@ +@@ -1007,7 +1007,7 @@ void collectInnerClasses() { // Capture inner classes, removing them from individual classes. // Irregular inner classes must stay local, though. @@ -715,9 +674,9 @@ 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-08-29 13:51:21.609694141 +0100 -@@ -181,8 +181,8 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-09-26 02:21:47.757128330 +0100 +@@ -183,8 +183,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; { @@ -728,7 +687,7 @@ String[] keys = { Pack200.Packer.CLASS_ATTRIBUTE_PFX, Pack200.Packer.FIELD_ATTRIBUTE_PFX, -@@ -590,7 +590,7 @@ +@@ -593,7 +593,7 @@ assert(pkg.files.containsAll(pkg.getClassStubs())); // Order of stubs in file list must agree with classes. List<Package.File> res = pkg.files; @@ -737,7 +696,7 @@ .retainAll(pkg.getClassStubs()) || true); assert(res.equals(pkg.getClassStubs())); } -@@ -623,7 +623,7 @@ +@@ -626,7 +626,7 @@ List<InFile> scanJar(JarFile jf) throws IOException { // Collect jar entries, preserving order. @@ -747,8 +706,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-08-29 13:51:21.609694141 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-09-26 02:21:47.757128330 +0100 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -759,31 +718,40 @@ 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-08-29 13:50:51.349270790 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-08-29 13:51:21.613694197 +0100 -@@ -47,8 +47,8 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-09-26 02:24:14.871342795 +0100 +@@ -48,8 +48,8 @@ */ - final class PropMap implements SortedMap<String, String> { -- private final TreeMap<String, String> theMap = new TreeMap<>();; + final class PropMap implements SortedMap<Object, Object> { +- private final TreeMap<Object, Object> theMap = new TreeMap<>();; - private final List<PropertyChangeListener> listenerList = new ArrayList<>(1); -+ private final TreeMap<String, String> theMap = new TreeMap<String, String>();; ++ private final TreeMap<Object, Object> theMap = new TreeMap<Object, Object>();; + private final List<PropertyChangeListener> listenerList = new ArrayList<PropertyChangeListener>(1); void addListener(PropertyChangeListener listener) { listenerList.add(listener); -@@ -187,7 +187,7 @@ +@@ -150,7 +150,7 @@ + } + } + +- defaultProps = (new HashMap<>(props)); // shrink to fit ++ defaultProps = (new HashMap<Object,Object>(props)); // shrink to fit + } + + PropMap() { +@@ -186,7 +186,7 @@ // Get sequence of props for "prefix", and "prefix.*". - List<String> getProperties(String prefix) { - Collection<String> values = prefixMap(prefix).values(); -- List<String> res = new ArrayList<>(values.size()); -+ List<String> res = new ArrayList<String>(values.size()); + List getProperties(String prefix) { + Collection<Object> values = prefixMap(prefix).values(); +- List<Object> res = new ArrayList<>(values.size()); ++ List<Object> res = new ArrayList<Object>(values.size()); res.addAll(values); 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-08-29 13:51:21.613694197 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-09-26 02:21:47.757128330 +0100 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -804,9 +772,9 @@ } 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-08-29 13:50:51.353270846 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-08-29 13:51:21.613694197 +0100 -@@ -232,7 +232,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-09-26 02:21:47.757128330 +0100 +@@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); // Now write out the files. @@ -816,8 +784,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-08-29 13:50:51.353270846 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-08-29 13:51:21.613694197 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-09-26 02:21:47.757128330 +0100 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -828,8 +796,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-08-29 13:51:21.613694197 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-09-26 02:21:47.761128390 +0100 @@ -1284,7 +1284,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -849,8 +817,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-08-29 13:51:21.613694197 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-09-26 02:21:47.761128390 +0100 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -861,8 +829,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-08-29 13:51:21.613694197 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-09-26 02:21:47.761128390 +0100 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -877,8 +845,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-08-29 13:51:21.613694197 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-09-26 02:21:47.761128390 +0100 @@ -152,7 +152,7 @@ // new configuration @@ -907,8 +875,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-09-26 02:21:47.761128390 +0100 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -919,8 +887,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-09-26 02:21:47.761128390 +0100 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -931,8 +899,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-09-26 02:21:47.761128390 +0100 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -943,8 +911,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-09-26 02:21:47.761128390 +0100 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -955,8 +923,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-09-26 02:21:47.761128390 +0100 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -967,8 +935,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-09-26 02:21:47.761128390 +0100 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -979,8 +947,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2012-09-26 02:28:36.451299216 +0100 @@ -97,7 +97,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -990,9 +958,27 @@ private Class beanClass; private BeanInfo explicitBeanInfo; +@@ -1472,7 +1472,7 @@ + this.defaultProperty = defaultProperty; + this.methods = methods; + this.targetBeanInfoRef = (targetBeanInfo != null) +- ? new SoftReference<>(targetBeanInfo) ++ ? new SoftReference<BeanInfo>(targetBeanInfo) + : null; + } + +@@ -1556,7 +1556,7 @@ + targetBeanInfo = ThreadGroupContext.getContext().getBeanInfoFinder() + .find(this.beanDescriptor.getBeanClass()); + if (targetBeanInfo != null) { +- this.targetBeanInfoRef = new SoftReference<>(targetBeanInfo); ++ this.targetBeanInfoRef = new SoftReference<BeanInfo>(targetBeanInfo); + } + } + return targetBeanInfo; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-09-26 02:21:47.761128390 +0100 @@ -42,7 +42,7 @@ */ final class ThreadGroupContext { @@ -1012,8 +998,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-09-26 02:21:47.761128390 +0100 @@ -34,7 +34,7 @@ */ @@ -1033,8 +1019,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2012-09-26 02:21:47.761128390 +0100 @@ -57,7 +57,7 @@ private volatile boolean closed = false; @@ -1045,8 +1031,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2012-09-26 02:21:47.765128450 +0100 @@ -1082,7 +1082,7 @@ if ((names == null) || (filter == null)) { return names; @@ -1075,8 +1061,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2012-09-26 02:21:47.765128450 +0100 @@ -70,7 +70,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -1087,8 +1073,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2012-09-26 02:21:47.765128450 +0100 @@ -725,7 +725,7 @@ */ @@ -1117,8 +1103,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-08-29 13:51:21.617694253 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-09-26 02:21:47.765128450 +0100 @@ -213,7 +213,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -1143,8 +1129,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-09-26 02:21:47.765128450 +0100 @@ -165,11 +165,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1169,8 +1155,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-09-26 02:21:47.765128450 +0100 @@ -84,18 +84,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1251,8 +1237,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2012-09-26 02:21:47.765128450 +0100 @@ -47,7 +47,7 @@ } } @@ -1263,8 +1249,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2012-09-26 02:21:47.765128450 +0100 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1285,8 +1271,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2012-09-26 02:21:47.765128450 +0100 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1297,8 +1283,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2012-09-26 02:21:47.769128510 +0100 @@ -1308,7 +1308,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -1393,8 +1379,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2012-09-26 02:21:47.769128510 +0100 @@ -246,7 +246,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1501,8 +1487,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2012-09-26 02:21:47.769128510 +0100 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -1544,8 +1530,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-08-29 13:50:51.285269895 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2012-08-29 13:51:21.621694309 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2012-09-26 02:14:39.390727017 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2012-09-26 02:21:47.769128510 +0100 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -1556,8 +1542,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2012-09-26 02:21:47.769128510 +0100 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -1595,8 +1581,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-08-29 13:50:51.353270846 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2012-09-26 02:14:39.446727849 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2012-09-26 02:21:47.769128510 +0100 @@ -596,13 +596,16 @@ } @@ -1618,8 +1604,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2012-09-26 02:21:47.769128510 +0100 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1639,8 +1625,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2012-09-26 02:21:47.769128510 +0100 @@ -136,7 +136,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1651,8 +1637,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2012-09-26 02:21:47.769128510 +0100 @@ -232,7 +232,7 @@ /** maps a class loader to the proxy class cache for that loader */ @@ -1681,8 +1667,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2012-09-26 02:21:47.769128510 +0100 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1693,8 +1679,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2012-09-26 02:21:47.769128510 +0100 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -1708,8 +1694,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2012-09-26 02:21:47.769128510 +0100 @@ -2282,7 +2282,7 @@ int off = 0; int next = 0; @@ -1720,8 +1706,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2012-09-26 02:21:47.769128510 +0100 @@ -1616,7 +1616,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -1747,8 +1733,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2012-09-26 02:21:47.773128570 +0100 @@ -917,7 +917,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -1768,8 +1754,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2012-09-26 02:21:47.773128570 +0100 @@ -677,7 +677,7 @@ static InetAddressImpl impl; @@ -1789,8 +1775,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2012-09-26 02:21:47.773128570 +0100 @@ -205,7 +205,7 @@ */ @@ -1801,8 +1787,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-08-29 13:50:51.357270902 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2012-08-29 13:51:21.625694365 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2012-09-26 02:14:39.450727908 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2012-09-26 02:21:47.773128570 +0100 @@ -1493,7 +1493,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -1822,8 +1808,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2012-09-26 02:21:47.773128570 +0100 @@ -124,7 +124,7 @@ this.context = null; } @@ -1834,8 +1820,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2012-09-26 02:21:47.773128570 +0100 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -1846,8 +1832,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2012-09-26 02:21:47.773128570 +0100 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -1871,8 +1857,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2012-09-26 02:21:47.773128570 +0100 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -1892,8 +1878,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2012-09-26 02:21:47.773128570 +0100 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -1913,8 +1899,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2012-09-26 02:21:47.773128570 +0100 @@ -368,8 +368,8 @@ int swag = 32; int vcap = 8; @@ -1927,8 +1913,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2012-09-26 02:21:47.773128570 +0100 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -1957,8 +1943,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2012-09-26 02:21:47.777128630 +0100 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -1969,8 +1955,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2012-09-26 02:21:47.777128630 +0100 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -2017,8 +2003,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2012-09-26 02:21:47.777128630 +0100 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -2056,8 +2042,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2012-09-26 02:21:47.777128630 +0100 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -2068,8 +2054,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2012-09-26 02:21:47.777128630 +0100 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -2099,8 +2085,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2012-08-29 13:51:21.629694421 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2012-09-26 02:21:47.777128630 +0100 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -2111,8 +2097,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2012-09-26 02:21:47.777128630 +0100 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -2738,8 +2724,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2012-09-26 02:21:47.777128630 +0100 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -2750,8 +2736,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2012-09-26 02:21:47.777128630 +0100 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -2774,8 +2760,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-08-29 13:50:51.289269951 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2012-09-26 02:14:39.390727017 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2012-09-26 02:21:47.781128690 +0100 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -2786,8 +2772,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-08-29 13:50:51.297270063 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2012-09-26 02:14:39.390727017 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2012-09-26 02:21:47.781128690 +0100 @@ -868,7 +868,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -2798,8 +2784,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2012-09-26 02:21:47.781128690 +0100 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -2846,8 +2832,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-08-29 13:50:51.297270063 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2012-09-26 02:14:39.390727017 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2012-09-26 02:21:47.781128690 +0100 @@ -568,7 +568,7 @@ // Creates the new entry. @@ -2903,8 +2889,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2012-09-26 02:21:47.781128690 +0100 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -2924,8 +2910,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2012-09-26 02:21:47.781128690 +0100 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -2936,8 +2922,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2012-09-26 02:21:47.781128690 +0100 @@ -238,7 +238,7 @@ */ @Override @@ -2957,8 +2943,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2012-09-26 02:21:47.781128690 +0100 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -2996,8 +2982,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2012-08-29 13:51:21.633694477 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2012-09-26 02:21:47.781128690 +0100 @@ -187,7 +187,7 @@ return; @@ -3008,8 +2994,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2012-09-26 02:21:47.781128690 +0100 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -3020,8 +3006,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2012-09-26 02:21:47.781128690 +0100 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -3032,8 +3018,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2012-09-26 02:21:47.781128690 +0100 @@ -59,7 +59,7 @@ */ @@ -3044,8 +3030,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2012-09-26 02:21:47.781128690 +0100 @@ -170,7 +170,7 @@ private LogManager manager; private String name; @@ -3065,8 +3051,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2012-09-26 02:21:47.781128690 +0100 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -3077,8 +3063,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2012-09-26 02:21:47.781128690 +0100 @@ -156,7 +156,8 @@ private final static Level defaultLevel = Level.INFO; @@ -3117,8 +3103,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2012-09-26 02:21:47.781128690 +0100 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -3130,8 +3116,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2012-09-26 02:21:47.785128749 +0100 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -3162,8 +3148,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2012-09-26 02:21:47.785128749 +0100 @@ -538,7 +538,7 @@ cursor--; else { @@ -3174,8 +3160,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2012-09-26 02:21:47.785128749 +0100 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -3186,8 +3172,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2012-09-26 02:21:47.785128749 +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> @@ -3225,8 +3211,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2012-08-29 13:51:21.637694533 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2012-09-26 02:21:47.785128749 +0100 @@ -193,8 +193,8 @@ } }; @@ -3239,8 +3225,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2012-09-26 02:21:47.785128749 +0100 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -3251,8 +3237,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2012-09-26 02:21:47.785128749 +0100 @@ -289,7 +289,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -3317,8 +3303,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2012-09-26 02:21:47.785128749 +0100 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3347,8 +3333,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2012-09-26 02:21:47.785128749 +0100 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3359,8 +3345,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2012-09-26 02:21:47.785128749 +0100 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3416,8 +3402,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2012-09-26 02:21:47.785128749 +0100 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3485,8 +3471,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2012-09-26 02:21:47.789128810 +0100 @@ -171,7 +171,7 @@ /** * Reference queue for cleared WeakEntries @@ -3519,8 +3505,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2012-09-26 02:21:47.789128810 +0100 @@ -319,7 +319,7 @@ // the outstanding inputstreams that need to be closed, @@ -3549,8 +3535,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2012-09-26 02:21:47.789128810 +0100 @@ -53,8 +53,8 @@ } @@ -3562,9 +3548,61 @@ private CRC32 crc = new CRC32(); private long written = 0; private long locoff = 0; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2012-09-26 02:29:13.867867055 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2012-09-26 02:34:09.208365186 +0100 +@@ -84,7 +84,7 @@ + * no CryptoPermissionCollections. + */ + CryptoPermissions() { +- perms = new ConcurrentHashMap<>(7); ++ perms = new ConcurrentHashMap<String,PermissionCollection>(7); + } + + /** +@@ -424,7 +424,7 @@ + + String alg = cryptoPerm.getAlgorithm(); + +- PermissionCollection pc = (PermissionCollection)perms.get(alg); ++ PermissionCollection pc = perms.get(alg); + + if (pc == null) { + pc = cryptoPerm.newPermissionCollection(); +@@ -440,15 +440,15 @@ + (Hashtable<String,PermissionCollection>) + (fields.get("perms", null)); + if (permTable != null) { +- perms = new ConcurrentHashMap<>(permTable); ++ perms = new ConcurrentHashMap<String,PermissionCollection>(permTable); + } else { +- perms = new ConcurrentHashMap<>(); ++ perms = new ConcurrentHashMap<String,PermissionCollection>(); + } + } + + private void writeObject(ObjectOutputStream s) throws IOException { + Hashtable<String,PermissionCollection> permTable = +- new Hashtable<>(perms); ++ new Hashtable<String,PermissionCollection>(perms); + ObjectOutputStream.PutField fields = s.putFields(); + fields.put("perms", permTable); + s.writeFields(); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2012-09-26 02:52:51.985696217 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2012-09-26 02:53:07.277934510 +0100 +@@ -54,7 +54,7 @@ + private static final CryptoAllPermission allPerm; + private static final Vector TrustedCallersCache = new Vector(2); + private static final ConcurrentMap<URL,CryptoPermissions> exemptCache = +- new ConcurrentHashMap<>(); ++ new ConcurrentHashMap<URL,CryptoPermissions>(); + private static final CryptoPermissions CACHE_NULL_MARK = + new CryptoPermissions(); + 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2012-09-26 02:21:47.789128810 +0100 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -3575,8 +3613,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2012-09-26 02:21:47.789128810 +0100 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -3587,8 +3625,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2012-09-26 02:21:47.789128810 +0100 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -3599,8 +3637,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2012-09-26 02:21:47.789128810 +0100 @@ -48,7 +48,7 @@ private Subject subject; @@ -3611,8 +3649,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-08-29 13:50:51.389271350 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-08-29 13:51:21.641694589 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-09-26 02:14:39.462728087 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-09-26 02:21:47.789128810 +0100 @@ -59,7 +59,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap[n]; // unchecked warning expected here @@ -3650,8 +3688,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2012-09-26 02:21:47.789128810 +0100 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -3662,8 +3700,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2012-09-26 02:21:47.789128810 +0100 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -3674,9 +3712,9 @@ 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-08-29 13:50:51.213268888 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-08-29 13:51:21.645694645 +0100 -@@ -169,7 +169,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-09-26 02:14:39.454727968 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-09-26 02:21:47.789128810 +0100 +@@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); ostream.println(PROP_SETTINGS); @@ -3685,7 +3723,7 @@ sortedPropertyKeys.addAll(p.stringPropertyNames()); Collections.sort(sortedPropertyKeys); for (String x : sortedPropertyKeys) { -@@ -244,7 +244,7 @@ +@@ -246,7 +246,7 @@ } // Locale does not implement Comparable so we convert it to String // and sort it for pretty printing. @@ -3713,8 +3751,8 @@ System.err.println("Incoming arguments:"); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-09-26 02:21:47.789128810 +0100 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -3725,8 +3763,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2012-09-26 02:21:47.789128810 +0100 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -3755,8 +3793,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2012-09-26 02:21:47.789128810 +0100 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -3767,8 +3805,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2012-09-26 02:21:47.789128810 +0100 @@ -2628,7 +2628,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -3788,8 +3826,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2012-09-26 02:21:47.789128810 +0100 @@ -239,7 +239,7 @@ url = null; } @@ -3800,8 +3838,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2012-09-26 02:21:47.789128810 +0100 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -3839,8 +3877,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2012-09-26 02:21:47.793128871 +0100 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -3851,8 +3889,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2012-09-26 02:21:47.793128871 +0100 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -3865,8 +3903,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2012-09-26 02:21:47.793128871 +0100 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -3877,8 +3915,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2012-09-26 02:21:47.793128871 +0100 @@ -77,7 +77,7 @@ throws IOException { @@ -3898,8 +3936,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2012-09-26 02:21:47.793128871 +0100 @@ -71,7 +71,7 @@ @Override @@ -3910,8 +3948,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2012-09-26 02:21:47.793128871 +0100 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -3931,8 +3969,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2012-09-26 02:21:47.793128871 +0100 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -3997,8 +4035,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2012-09-26 02:21:47.793128871 +0100 @@ -150,10 +150,10 @@ /** maps activation id to its respective group id */ @@ -4026,8 +4064,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2012-08-29 13:51:21.645694645 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2012-09-26 02:21:47.793128871 +0100 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -4038,8 +4076,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2012-09-26 02:21:47.793128871 +0100 @@ -41,15 +41,15 @@ // or principal. // @@ -4080,8 +4118,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2012-09-26 02:21:47.793128871 +0100 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -4101,8 +4139,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2012-09-26 02:21:47.793128871 +0100 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -4140,8 +4178,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2012-09-26 02:21:47.793128871 +0100 @@ -40,7 +40,7 @@ public class Providers { @@ -4152,8 +4190,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2012-09-26 02:21:47.793128871 +0100 @@ -267,7 +267,7 @@ if (ktabs.isEmpty()) { return kk.toArray(new KerberosKey[kk.size()]); @@ -4164,9 +4202,9 @@ 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2012-08-29 13:51:21.649694701 +0100 -@@ -551,7 +551,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2012-09-26 02:21:47.793128871 +0100 +@@ -576,7 +576,7 @@ } }))); String Line; @@ -4175,7 +4213,7 @@ String previous = null; while ((Line = br.readLine()) != null) { // ignore comments and blank line in the configuration file. -@@ -612,7 +612,7 @@ +@@ -637,7 +637,7 @@ throw new KrbException("I/O error while reading" + " configuration file."); } @@ -4184,7 +4222,7 @@ for (int i = 0; i < v.size(); i++) { String line = v.elementAt(i).trim(); if (line.equalsIgnoreCase("[realms]")) { -@@ -621,7 +621,7 @@ +@@ -646,7 +646,7 @@ if ((count == v.size()) || (v.elementAt(count).startsWith("["))) { Hashtable<String,Hashtable<String,Vector<String>>> temp = @@ -4193,7 +4231,7 @@ temp = parseRealmField(v, i + 1, count); table.put("realms", temp); i = count - 1; -@@ -634,7 +634,7 @@ +@@ -659,7 +659,7 @@ if ((count == v.size()) || (v.elementAt(count).startsWith("["))) { Hashtable<String,Hashtable<String,Vector<String>>> temp = @@ -4202,7 +4240,7 @@ temp = parseRealmField(v, i + 1, count); table.put("capaths", temp); i = count - 1; -@@ -779,7 +779,7 @@ +@@ -809,7 +809,7 @@ * Parses key-value pairs under a stanza name. */ private Hashtable<String,String> parseField(Vector<String> v, int start, int end) { @@ -4211,7 +4249,7 @@ String line; for (int i = start; i < end; i++) { line = v.elementAt(i); -@@ -801,7 +801,7 @@ +@@ -831,7 +831,7 @@ * information for the realm given within a pair of braces. */ private Hashtable<String,Hashtable<String,Vector<String>>> parseRealmField(Vector<String> v, int start, int end) { @@ -4220,7 +4258,7 @@ String line; for (int i = start; i < end; i++) { line = v.elementAt(i).trim(); -@@ -841,9 +841,9 @@ +@@ -871,9 +871,9 @@ * Parses key-value pairs within each braces under [realms]. */ private Hashtable<String,Vector<String>> parseRealmFieldEx(Vector<String> v, int start, int end) { @@ -4233,7 +4271,7 @@ String line = ""; String key; for (int i = start; i < end; i++) { -@@ -948,7 +948,7 @@ +@@ -978,7 +978,7 @@ } st = new StringTokenizer(default_enctypes, delim); int len = st.countTokens(); @@ -4243,8 +4281,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2012-09-26 02:21:47.793128871 +0100 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4255,8 +4293,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2012-09-26 02:21:47.793128871 +0100 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4267,8 +4305,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2012-09-26 02:21:47.793128871 +0100 @@ -490,7 +490,7 @@ private static String exec(String c) { @@ -4279,8 +4317,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2012-09-26 02:21:47.793128871 +0100 @@ -257,7 +257,7 @@ + configName); } @@ -4291,8 +4329,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2012-09-26 02:21:47.793128871 +0100 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4303,8 +4341,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2012-09-26 02:21:47.797128931 +0100 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -4324,8 +4362,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2012-09-26 02:21:47.797128931 +0100 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -4354,8 +4392,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2012-09-26 02:21:47.797128931 +0100 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4366,8 +4404,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2012-09-26 02:21:47.797128931 +0100 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4378,8 +4416,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2012-09-26 02:21:47.797128931 +0100 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4390,8 +4428,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2012-09-26 02:21:47.797128931 +0100 @@ -259,7 +259,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -4402,8 +4440,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-08-29 13:50:51.365271014 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-09-26 02:14:39.450727908 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2012-09-26 02:21:47.797128931 +0100 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -4422,7 +4460,7 @@ /** * Constructs a KeyTab object. -@@ -280,7 +280,7 @@ +@@ -282,7 +282,7 @@ KeyTabEntry entry; EncryptionKey key; int size = entries.size(); @@ -4431,7 +4469,7 @@ for (int i = size-1; i >= 0; i--) { entry = entries.elementAt(i); if (entry.service.match(service)) { -@@ -482,7 +482,7 @@ +@@ -484,7 +484,7 @@ int count = 0; // Remember the highest KVNO for each etype. Used for kvno == -2 @@ -4441,8 +4479,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2012-09-26 02:21:47.797128931 +0100 @@ -77,7 +77,7 @@ */ @@ -4453,8 +4491,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2012-09-26 02:21:47.797128931 +0100 @@ -462,7 +462,7 @@ */ static class KdcAccessibility { @@ -4477,8 +4515,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2012-08-29 13:51:21.649694701 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2012-09-26 02:21:47.797128931 +0100 @@ -238,7 +238,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4498,8 +4536,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2012-09-26 02:21:47.797128931 +0100 @@ -359,14 +359,14 @@ } @@ -4518,8 +4556,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2012-09-26 02:21:47.797128931 +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 @@ -4530,8 +4568,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2012-09-26 02:21:47.797128931 +0100 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -4542,8 +4580,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2012-09-26 02:21:47.797128931 +0100 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -4599,8 +4637,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2012-09-26 02:21:47.797128931 +0100 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -4611,8 +4649,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2012-09-26 02:21:47.797128931 +0100 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4623,8 +4661,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2012-09-26 02:21:47.797128931 +0100 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -4670,8 +4708,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2012-09-26 02:21:47.797128931 +0100 @@ -219,7 +219,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -4682,8 +4720,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2012-09-26 02:21:47.797128931 +0100 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4694,8 +4732,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2012-09-26 02:21:47.801128991 +0100 @@ -393,7 +393,7 @@ // Map BulkCipher -> Boolean(available) @@ -4706,8 +4744,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2012-09-26 02:21:47.801128991 +0100 @@ -656,7 +656,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -4736,8 +4774,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2012-09-26 02:21:47.801128991 +0100 @@ -258,7 +258,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -4775,8 +4813,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2012-09-26 02:21:47.801128991 +0100 @@ -569,7 +569,7 @@ activeProtocols = getActiveProtocols(); } @@ -4796,8 +4834,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2012-09-26 02:21:47.801128991 +0100 @@ -169,7 +169,7 @@ return name; } @@ -4817,8 +4855,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2012-09-26 02:21:47.801128991 +0100 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -4829,8 +4867,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2012-08-29 13:51:21.653694757 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2012-09-26 02:21:47.801128991 +0100 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -4868,8 +4906,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2012-09-26 02:21:47.801128991 +0100 @@ -261,7 +261,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -4916,8 +4954,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2012-09-26 02:21:47.801128991 +0100 @@ -331,7 +331,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -4946,8 +4984,8 @@ if ((certs != null) && (certs.length > 0)){ Collections.addAll(trustedCerts, certs); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2012-09-26 02:21:47.801128991 +0100 @@ -618,7 +618,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -4967,9 +5005,9 @@ 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2012-08-29 13:51:21.657694813 +0100 -@@ -2512,7 +2512,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2012-09-26 02:21:47.801128991 +0100 +@@ -2510,7 +2510,7 @@ entrySet, HandshakeCompletedEvent e) { super("HandshakeCompletedNotify-Thread"); @@ -4979,8 +5017,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2012-09-26 02:21:47.801128991 +0100 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -5000,8 +5038,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2012-09-26 02:21:47.801128991 +0100 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -5012,8 +5050,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2012-09-26 02:21:47.801128991 +0100 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -5033,8 +5071,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2012-09-26 02:21:47.805129051 +0100 @@ -123,14 +123,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -5116,8 +5154,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-08-29 13:50:51.365271014 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-09-26 02:14:39.450727908 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2012-09-26 02:21:47.805129051 +0100 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -5188,8 +5226,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2012-08-29 13:51:21.657694813 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2012-09-26 02:21:47.805129051 +0100 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -5227,8 +5265,8 @@ super(i, b); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-08-29 13:50:51.369271070 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-09-26 02:14:39.450727908 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2012-09-26 02:21:47.805129051 +0100 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -5239,8 +5277,8 @@ /** * Checks if a certificate is untrusted. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2012-09-26 02:21:47.805129051 +0100 @@ -1260,7 +1260,7 @@ if (exts == null) { return null; @@ -5288,8 +5326,8 @@ namesCopy.add(Collections.unmodifiableList(nameEntryCopy)); } else { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2012-09-26 02:21:47.805129051 +0100 @@ -352,7 +352,7 @@ if (extensions == null) { return null; @@ -5318,8 +5356,8 @@ map.put(ext.getId(), ext); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2012-09-26 02:21:47.805129051 +0100 @@ -104,8 +104,8 @@ private X500Principal issuerPrincipal = null; private Date thisUpdate = null; @@ -5350,8 +5388,8 @@ if (!ex.isCritical()) { extSet.add(ex.getExtensionId().toString()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2012-09-26 02:21:47.805129051 +0100 @@ -95,7 +95,7 @@ * Run the converter */ @@ -5362,8 +5400,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2012-09-26 02:21:47.805129051 +0100 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -5478,8 +5516,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2012-09-26 02:21:47.809129111 +0100 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -5535,8 +5573,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2012-09-26 02:21:47.809129111 +0100 @@ -81,7 +81,7 @@ } @@ -5564,8 +5602,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2012-09-26 02:21:47.809129111 +0100 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -5602,8 +5640,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2012-09-26 02:21:47.809129111 +0100 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -5623,8 +5661,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2012-09-26 02:21:47.809129111 +0100 @@ -113,7 +113,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -5653,8 +5691,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2012-09-26 02:21:47.809129111 +0100 @@ -160,7 +160,7 @@ } @@ -5689,8 +5727,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2012-09-26 02:21:47.809129111 +0100 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -5703,8 +5741,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2012-09-26 02:21:47.809129111 +0100 @@ -134,7 +134,7 @@ throws IOException { @@ -5715,8 +5753,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2012-09-26 02:21:47.809129111 +0100 @@ -157,7 +157,7 @@ @Override @@ -5817,8 +5855,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2012-08-29 13:51:21.661694869 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2012-09-26 02:21:47.809129111 +0100 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -5829,8 +5867,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2012-09-26 02:21:47.809129111 +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. @@ -5841,8 +5879,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-08-29 13:50:51.369271070 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-09-26 02:14:39.454727968 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2012-09-26 02:21:47.809129111 +0100 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -5907,8 +5945,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-09-26 02:21:47.809129111 +0100 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -5928,8 +5966,8 @@ if (domain != null && domain.length() > 0) { sl.add(domain); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2012-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2012-09-26 02:21:47.809129111 +0100 @@ -130,7 +130,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); @@ -5940,8 +5978,8 @@ void initInterrupt(int fd0, int fd1) { 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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2012-09-26 02:21:47.809129111 +0100 @@ -153,12 +153,12 @@ static { @@ -5960,8 +5998,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2012-09-26 02:21:47.809129111 +0100 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -5981,8 +6019,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2012-09-26 02:21:47.809129111 +0100 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -5993,8 +6031,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2012-09-26 02:21:47.809129111 +0100 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -6005,8 +6043,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2012-09-26 02:21:47.813129171 +0100 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -6026,8 +6064,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2012-09-26 02:21:47.813129171 +0100 @@ -83,7 +83,7 @@ } @@ -6038,8 +6076,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2012-09-26 02:21:47.813129171 +0100 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -6050,8 +6088,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2012-09-26 02:21:47.813129171 +0100 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -6073,8 +6111,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2012-09-26 02:21:47.813129171 +0100 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -6085,8 +6123,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2012-09-26 02:21:47.813129171 +0100 @@ -128,7 +128,7 @@ } @@ -6097,8 +6135,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2012-09-26 02:21:47.813129171 +0100 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -6109,8 +6147,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2012-09-26 02:21:47.813129171 +0100 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -6121,8 +6159,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2012-09-26 02:21:47.813129171 +0100 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -6169,8 +6207,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2012-09-26 02:21:47.813129171 +0100 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -6181,8 +6219,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2012-09-26 02:21:47.813129171 +0100 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -6193,8 +6231,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2012-09-26 02:21:47.813129171 +0100 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -6205,8 +6243,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2012-08-29 13:51:21.665694925 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2012-09-26 02:21:47.813129171 +0100 @@ -103,7 +103,7 @@ } } @@ -6217,8 +6255,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2012-08-29 13:51:21.669694981 +0100 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2012-09-26 02:21:47.813129171 +0100 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -6229,8 +6267,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-08-29 13:24:58.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2012-08-29 13:51:21.669694981 +0100 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2012-09-26 02:21:47.813129171 +0100 @@ -59,7 +59,7 @@ } }
--- a/patches/boot/ecj-multicatch.patch Tue Sep 25 14:34:52 2012 +0200 +++ b/patches/boot/ecj-multicatch.patch Wed Sep 26 14:52:49 2012 +0100 @@ -219,3 +219,36 @@ throw new Error("Failed to record hashSeed offset", e); } } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jconsole/Resources.java openjdk-boot/jdk/src/share/classes/sun/tools/jconsole/Resources.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jconsole/Resources.java 2012-09-26 03:08:32.776450958 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jconsole/Resources.java 2012-09-26 03:09:50.525678273 +0100 +@@ -129,7 +129,9 @@ + private static void setFieldValue(Field field, String value) { + try { + field.set(null, value); +- } catch (IllegalArgumentException | IllegalAccessException e) { ++ } catch (IllegalArgumentException e) { ++ throw new Error("Unable to access or set message for field " + field.getName()); ++ } catch (IllegalAccessException e) { + throw new Error("Unable to access or set message for field " + field.getName()); + } + } +@@ -200,8 +202,16 @@ + try { + return KeyEvent.class.getDeclaredField("VK_" + c.toUpperCase()) + .getInt(null); +- } catch (IllegalArgumentException | IllegalAccessException +- | NoSuchFieldException | SecurityException e) { ++ } catch (IllegalArgumentException e) { ++ // Missing VK is okay ++ return 0; ++ } catch (IllegalAccessException e) { ++ // Missing VK is okay ++ return 0; ++ } catch (NoSuchFieldException e) { ++ // Missing VK is okay ++ return 0; ++ } catch (SecurityException e) { + // Missing VK is okay + return 0; + }
--- a/patches/boot/ecj-stringswitch.patch Tue Sep 25 14:34:52 2012 +0200 +++ b/patches/boot/ecj-stringswitch.patch Wed Sep 26 14:52:49 2012 +0100 @@ -1,10 +1,10 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-27 14:54:48.369035615 +0100 -@@ -350,18 +350,15 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-09-26 02:12:25.636743366 +0100 +@@ -350,19 +350,16 @@ if (attrCommands != null) { - Attribute.Layout lkey = Attribute.keyForLookup(ctype, name); - String cmd = attrCommands.get(lkey); + Object lkey = Attribute.keyForLookup(ctype, name); + String cmd = (String) attrCommands.get(lkey); - if (cmd != null) { - switch (cmd) { - case "pass": @@ -17,6 +17,7 @@ - skip(length, name + " attribute in " + h); - continue; - } +- } + if ("pass".equals(cmd)) { + String message1 = "passing attribute bitwise in " + h; + throw new Attribute.FormatException(message1, ctype, name, cmd); @@ -26,13 +27,14 @@ + } else if ("strip".equals(cmd)) { + skip(length, name + " attribute in " + h); + continue; - } ++ } } // Find canonical instance of the requested attribute. + Attribute a = Attribute.lookup(Package.attrDefs, ctype, name); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-06-11 00:38:08.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-27 14:52:45.595028657 +0100 -@@ -71,16 +71,14 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-09-26 02:11:37.444030490 +0100 +@@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. String arg0 = av.isEmpty() ? "" : av.get(0); @@ -56,7 +58,7 @@ } // Collect engine properties here: -@@ -180,21 +178,16 @@ +@@ -182,21 +180,16 @@ // Deal with remaining non-engine properties: for (String opt : avProps.keySet()) { String val = avProps.get(opt); @@ -89,9 +91,9 @@ if (logFile != null && !logFile.equals("")) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-27 14:31:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-27 14:52:45.599028722 +0100 -@@ -1107,30 +1107,25 @@ +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-09-26 02:11:37.444030490 +0100 +@@ -1116,30 +1116,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) Utils.log.info("Stripping "+what.toLowerCase()+" data and attributes..."); @@ -142,8 +144,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2011-04-30 03:28:32.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2011-07-27 14:52:45.603028787 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2012-09-26 02:11:37.444030490 +0100 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -180,9 +182,9 @@ fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2011-07-12 12:43:47.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2011-07-27 14:52:45.607028852 +0100 -@@ -211,14 +211,16 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2012-09-26 02:11:37.444030490 +0100 +@@ -219,14 +219,16 @@ private static boolean isObjectMethod(Method m) { @@ -203,7 +205,7 @@ return (m.getReturnType() == boolean.class && m.getParameterTypes().length == 1 && m.getParameterTypes()[0] == Object.class); -@@ -229,12 +231,14 @@ +@@ -237,12 +239,14 @@ private static Object callObjectMethod(Object self, Method m, Object[] args) { assert(isObjectMethod(m)) : m; @@ -223,9 +225,9 @@ } return null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-06-11 00:38:09.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-07-27 14:52:45.603028787 +0100 -@@ -117,24 +117,20 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-09-26 02:11:37.444030490 +0100 +@@ -119,24 +119,20 @@ String optStr = (opts.length > 1 && opts[1] != null) ? opts[1].trim() : "all"; @@ -262,9 +264,9 @@ /* diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2011-04-30 03:28:32.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2011-07-27 14:52:45.607028852 +0100 -@@ -383,19 +383,23 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2012-09-24 21:55:52.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2012-09-26 02:11:37.444030490 +0100 +@@ -378,19 +378,23 @@ GE; // ">=" static Operator of(String s) {