Mercurial > hg > release > icedtea7-2.3
changeset 2628:f328153e6c45
Sync with IcedTea7 2.3 forest HEAD and move to 2.3.6pre.
2013-02-11 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 13.
(OPENJDK_VERSION): Bump to b20.
(CORBA_CHANGESET): Update to IcedTea7 2.3 forest head,
bringing in regression fixes and u10 changes.
(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.
(ICEDTEA_BOOTSTRAP_CLASSES): Remove ClassValue,
no longer needed thanks to 8002068.
* NEWS: List backports from u10.
* configure.ac: Bump to 2.3.6pre
as 2.3.5 was a forest-only release due
to the regressions.
* hotspot.map: Sync default with 2.3 HEAD as other
changes above.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-trywithresources.patch:
Add additional cases required by u10 changes.
* patches/boot/ecj-multicatch.patch:
Drop CORBA case which was reverted in 8002068.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Tue, 12 Feb 2013 02:54:56 +0000 |
parents | 19a65ee9399c |
children | 5cbc5cca7c4c |
files | ChangeLog Makefile.am NEWS configure.ac hotspot.map patches/boot/ecj-diamond.patch patches/boot/ecj-multicatch.patch patches/boot/ecj-trywithresources.patch |
diffstat | 8 files changed, 646 insertions(+), 490 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 05 09:40:10 2013 +0000 +++ b/ChangeLog Tue Feb 12 02:54:56 2013 +0000 @@ -1,3 +1,35 @@ +2013-02-11 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (JDK_UPDATE_VERSION): Bump to 13. + (OPENJDK_VERSION): Bump to b20. + (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head, + bringing in regression fixes and u10 changes. + (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. + (ICEDTEA_BOOTSTRAP_CLASSES): Remove ClassValue, + no longer needed thanks to 8002068. + * NEWS: List backports from u10. + * configure.ac: Bump to 2.3.6pre + as 2.3.5 was a forest-only release due + to the regressions. + * hotspot.map: Sync default with 2.3 HEAD as other + changes above. + * patches/boot/ecj-diamond.patch, + * patches/boot/ecj-trywithresources.patch: + Add additional cases required by u10 changes. + * patches/boot/ecj-multicatch.patch: + Drop CORBA case which was reverted in 8002068. + 2013-02-05 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: List PR1295.
--- a/Makefile.am Tue Feb 05 09:40:10 2013 +0000 +++ b/Makefile.am Tue Feb 12 02:54:56 2013 +0000 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b30 -JDK_UPDATE_VERSION = 09 +OPENJDK_VERSION = b20 +JDK_UPDATE_VERSION = 13 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 5116fe321210 -JAXP_CHANGESET = 91fcc41a0b4b -JAXWS_CHANGESET = 8064f322e58d -JDK_CHANGESET = a16bf9aa6275 -LANGTOOLS_CHANGESET = afdfcc0ca555 -OPENJDK_CHANGESET = 02128561d696 +CORBA_CHANGESET = 97a8b625f6e9 +JAXP_CHANGESET = d7feafb8427b +JAXWS_CHANGESET = b900024eb4ba +JDK_CHANGESET = 6bb01322bb5a +LANGTOOLS_CHANGESET = e0739a8783d1 +OPENJDK_CHANGESET = dd8d1a8f222f -CORBA_SHA256SUM = 7ea949e32cff3b901aafb69939731469c88ded2036c7a2ae72b757f3f9517435 -JAXP_SHA256SUM = c92299f6f9b812f2b57f78c699a04f297bc261f51a76b8ff694dea168504805c -JAXWS_SHA256SUM = aed5c1ae9f80d4af02d183c71d46f223e05420f15cd379a98d413e09ad679bd1 -JDK_SHA256SUM = 87531928e9f4bc3c413df1bd09ff990d23ec03872e8df8aa4248389369b540f4 -LANGTOOLS_SHA256SUM = 30473c84f50ffb9db23887d0231fea6c81384d567506a37e392692eafa479c88 -OPENJDK_SHA256SUM = 2da96c984e35a13d64c92ad6670244d506b113a67289adeeaee77b43edb5f267 +CORBA_SHA256SUM = 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d +JAXP_SHA256SUM = 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941 +JAXWS_SHA256SUM = 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2 +JDK_SHA256SUM = a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2 +LANGTOOLS_SHA256SUM = 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb +OPENJDK_SHA256SUM = a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 @@ -99,7 +99,7 @@ SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS) # Sources used from OpenJDK. -ICEDTEA_BOOTSTRAP_CLASSES = $(SHARE)/java/lang/ClassValue.java +ICEDTEA_BOOTSTRAP_CLASSES = #PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement if LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT
--- a/NEWS Tue Feb 05 09:40:10 2013 +0000 +++ b/NEWS Tue Feb 12 02:54:56 2013 +0000 @@ -49,7 +49,63 @@ - S8001972, CVE-2013-1478: Improve image processing - S8002325, CVE-2013-1480: Improve management of images * Backports + - S7057320: test/java/util/concurrent/Executors/AutoShutdown.java failing intermittently + - S7083664: TEST_BUG: test hard code of using c:/temp but this dir might not exist + - S7107613: scalability blocker in javax.crypto.CryptoPermissions + - S7107616: scalability blocker in javax.crypto.JceSecurityManager + - S7146424: Wildcard expansion for single entry classpath + - S7160609: [macosx] JDK crash in libjvm.dylib ( C [GeForceGLDriver+0x675a] gldAttachDrawable+0x941) + - S7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar + - S7162488: VM not printing unknown -XX options + - S7169395: Exception throws due to the changes in JDK 7 object tranversal and break backward compatibility - S7175616: Port fix for TimeZone from JDK 8 to JDK 7 + - S7176485: (bf) Allow temporary buffer cache to grow to IOV_MAX + - S7179908: Fork hs23.3 hsx from hs22.2 for jdk7u7 and reinitialize build number + - S7184326: TEST_BUG: java/awt/Frame/7024749/bug7024749.java has a typo + - S7185245: Licensee source bundle tries to compile JFR + - S7185471: Avoid key expansion when AES cipher is re-init w/ the same key + - S7186371: [macosx] Main menu shortcuts not displayed (7u6 regression) + - S7187834: [macosx] Usage of private API in macosx 2d implementation causes Apple Store rejection + - S7188114: (launcher) need an alternate command line parser for Windows + - S7189136: Fork hs23.5 hsx from hs23.4 for jdk7u9 and reinitialize build number + - S7189350: Fix failed for CR 7162144 + - S7190550: REGRESSION: Some closed/com/oracle/jfr/api tests fail to compile becuse of fix 7185245 + - S7193219: JComboBox serialization fails in JDK 1.7 + - S7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties + - S7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released + - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node + - S7195931: UnsatisfiedLinkError on PKCS11.C_GetOperationState while using NSS from jre7u6+ + - S7197071: Makefiles for various security providers aren't including the default manifest. + - S7197652: Impossible to run any signed JNLP applications or applets, OCSP off by default + - S7198146: Another new regression test does not compile on windows-amd64 + - S7198570: (tz) Support tzdata2012f + - S7198640: new hotspot build - hs23.6-b04 + - S7199488: [TEST] runtime/7158800/InternTest.java failed due to false-positive on PID match. + - S7199645: Increment build # of hs23.5 to b02 + - S7199669: Update tags in .hgtags file for CPU release rename + - S7200720: crash in net.dll during NTLM authentication + - S7200742: (se) Selector.select does not block when starting Coherence (sol11u1) + - S7200762: [macosx] Stuck in sun.java2d.opengl.CGLGraphicsConfig.getMaxTextureSize(Native Method) + - S8000285: Deadlock between PostEventQueue.noEvents, EventQueue.isDispatchThread and SwingUtilities.invokeLater + - S8000286: [macosx] Views keep scrolling back to the drag position after DnD + - S8000297: REGRESSION: closed/java/awt/EventQueue/PostEventOrderingTest.java fails + - S8000307: Jre7cert: focusgained does not get called for all focus req when do alt + tab + - S8000822: Fork hs23.7 hsx from hs23.6 for jdk7u11 and reinitialize build number + - S8001124: jdk7u ProblemList.txt updates (10/2012) + - S8001242: Improve RMI HTTP conformance + - S8001808: Create a test for 8000327 + - S8001876: Create regtest for 8000283 + - S8002068: Build broken: corba code changes unable to use new JDK 7 classes + - S8002091: tools/launcher/ToolsOpts.java test started to fail since 7u11 b01 on Windows + - S8002114: fix failed for JDK-7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar + - S8002225: (tz) Support tzdata2012i + - S8003402: (dc) test/java/nio/channels/DatagramChannel/SendToUnresovled.java failing after 7u11 cleanup issues + - S8003403: Test ShortRSAKeyWithinTLS and ClientJSSEServerJSSE failing after 7u11 cleanup + - S8003948: NTLM/Negotiate authentication problem + - S8004175: Restricted packages added in java.security are missing in java.security-{macosx, solaris, windows} + - S8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01 + - S8004341: Two JCK tests fails with 7u11 b06 + - S8005615: Java Logger fails to load tomcat logger implementation (JULI) * Bug fixes - Fix build using Zero's HotSpot so all patches apply again. - PR1295: jamvm parallel unpack failure
--- a/configure.ac Tue Feb 05 09:40:10 2013 +0000 +++ b/configure.ac Tue Feb 12 02:54:56 2013 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.3.5pre], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.3.6pre], [distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile])
--- a/hotspot.map Tue Feb 05 09:40:10 2013 +0000 +++ b/hotspot.map Tue Feb 12 02:54:56 2013 +0000 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ad27d7c42279 cc6c3e631f7b745f7a4bd8ff0a6fd75ccde06e7aa58e0d20d2254a1c98937538 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot bc0de5a0ece2 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068 zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot a456d0771ba0 09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0
--- a/patches/boot/ecj-diamond.patch Tue Feb 05 09:40:10 2013 +0000 +++ b/patches/boot/ecj-diamond.patch Tue Feb 12 02:54:56 2013 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-07-20 19:13:29.537633988 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-02-02 15:57:52.018737343 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-02-11 21:40:54.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-02-12 00:10:02.178178345 +0000 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-02-02 13:42:15.037347115 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-02-11 21:40:54.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-02-12 00:10:02.178178345 +0000 @@ -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-07-20 19:13:29.621635717 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-02-11 21:40:54.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-02-12 00:10:02.178178345 +0000 @@ -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/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-10-11 14:16:40.677525442 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-02-12 00:10:02.178178345 +0000 @@ -62,9 +62,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -61,8 +61,8 @@ private Reference<ClassLoader> loader; private ExceptionListener listener; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-07-20 19:23:35.521421032 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-02-12 00:10:02.178178345 +0000 @@ -239,9 +239,9 @@ } } @@ -76,8 +76,8 @@ /** * Constructs the type resolver for the given actual type. 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-07-20 19:23:35.685424083 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-12 00:10:02.178178345 +0000 @@ -103,9 +103,9 @@ return this.def.compareTo(that.def); } @@ -149,8 +149,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-02 15:37:06.051471139 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-12 00:09:29.341652316 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-12 00:10:02.178178345 +0000 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -219,8 +219,8 @@ return true; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-02 15:37:05.975469923 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-12 00:09:29.129648920 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-12 00:10:02.178178345 +0000 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -231,8 +231,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-07-20 19:23:35.689424155 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-12 00:10:02.182178409 +0000 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -269,8 +269,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-07-20 19:23:35.689424155 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-12 00:10:02.182178409 +0000 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -281,8 +281,8 @@ Coding x1 = codeMap.get(x0); if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-02 13:23:34.763400328 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-02 15:57:52.082738368 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-12 00:10:02.182178409 +0000 @@ -915,7 +915,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -311,8 +311,8 @@ Entry e = work.previous(); work.remove(); // pop stack diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-02 15:37:06.051471139 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-12 00:09:29.341652316 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-12 00:10:02.182178409 +0000 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -350,8 +350,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-07-20 19:23:35.693424229 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-12 00:10:02.186178473 +0000 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -362,8 +362,8 @@ for (int i = 0 ; i < capacity ; i++) { flist.add(null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-07-20 19:23:35.693424229 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-12 00:10:02.186178473 +0000 @@ -126,11 +126,11 @@ public void setBytes(byte[] newBytes) { if (bytes == newBytes) return; @@ -388,8 +388,8 @@ static final int LOC_SHIFT = 1; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-02 15:37:05.975469923 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-12 00:09:29.129648920 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-12 00:10:02.186178473 +0000 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -554,8 +554,8 @@ // Add to the end of ths list: if (!fileSet.contains(cls.file)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-02 15:37:06.051471139 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-12 00:09:29.341652316 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-12 00:10:02.186178473 +0000 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -669,8 +669,8 @@ ClassEntry thisClass = curClass.thisClass; ClassEntry superClass = curClass.superClass; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-02 15:37:06.051471139 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-12 00:09:29.345652380 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-12 00:10:02.186178473 +0000 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -726,8 +726,8 @@ for (Class cls : pkg.classes) { if (!cls.hasInnerClasses()) continue; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-02 13:14:33.330732979 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-12 00:10:02.186178473 +0000 @@ -181,8 +181,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -758,8 +758,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-07-20 19:23:35.697424304 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-12 00:10:02.186178473 +0000 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -770,8 +770,8 @@ maxForDebug += fillp; int min = Integer.MIN_VALUE; // farthest from the center diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-02 15:37:06.055471202 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-12 00:09:29.345652380 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-12 00:10:02.186178473 +0000 @@ -47,8 +47,8 @@ */ @@ -793,8 +793,8 @@ while (res.remove(null)); return res; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-07-20 19:23:35.697424304 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-12 00:10:02.186178473 +0000 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -815,8 +815,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-02 15:37:06.055471202 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-12 00:09:29.345652380 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-12 00:10:02.190178537 +0000 @@ -232,7 +232,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -827,8 +827,8 @@ String name = file.nameString; JarEntry je = new JarEntry(Utils.getJarEntryName(name)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-02 15:37:06.055471202 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-02 15:57:52.086738431 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-12 00:09:29.345652380 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-12 00:10:02.190178537 +0000 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -839,8 +839,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-07-20 19:23:36.029430487 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-02 15:57:52.090738496 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-12 00:10:02.190178537 +0000 @@ -1284,7 +1284,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -860,8 +860,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-07-20 19:23:36.037430638 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-12 00:10:02.190178537 +0000 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -872,8 +872,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-07-20 19:23:36.061431081 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-12 00:10:02.194178601 +0000 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -888,8 +888,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-07-20 19:23:36.061431081 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-12 00:10:02.194178601 +0000 @@ -152,7 +152,7 @@ // new configuration @@ -918,8 +918,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-07-20 19:23:36.061431081 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-12 00:10:02.194178601 +0000 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -930,8 +930,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-07-20 19:23:36.061431081 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-02-12 00:10:02.194178601 +0000 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -942,8 +942,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-07-20 19:23:36.065431155 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-02-12 00:10:02.194178601 +0000 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -954,8 +954,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-07-20 19:23:36.065431155 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-02-12 00:10:02.194178601 +0000 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -966,8 +966,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-07-20 19:23:36.057431009 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-02-12 00:10:02.198178665 +0000 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -978,8 +978,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-07-20 19:23:37.169451709 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2013-02-12 00:10:02.198178665 +0000 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -990,8 +990,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-07-20 19:23:37.553458861 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2013-02-12 00:13:05.801120130 +0000 @@ -95,7 +95,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -1001,9 +1001,27 @@ private Class beanClass; private BeanInfo explicitBeanInfo; +@@ -1452,7 +1452,7 @@ + this.defaultProperty = defaultProperty; + this.methods = methods; + this.targetBeanInfoRef = (targetBeanInfo != null) +- ? new SoftReference<>(targetBeanInfo) ++ ? new SoftReference<BeanInfo>(targetBeanInfo) + : null; + } + +@@ -1536,7 +1536,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-07-20 19:23:37.585459457 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-02-12 00:10:02.198178665 +0000 @@ -42,7 +42,7 @@ */ final class ThreadGroupContext { @@ -1023,8 +1041,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-07-20 19:23:37.597459681 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2013-02-12 00:10:02.198178665 +0000 @@ -34,7 +34,7 @@ */ @@ -1044,8 +1062,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-07-23 12:25:19.865812134 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2013-02-02 15:57:52.094738561 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2013-02-12 00:10:02.198178665 +0000 @@ -57,7 +57,7 @@ private volatile boolean closed = false; @@ -1056,8 +1074,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-07-20 19:23:37.601459754 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2013-02-12 00:10:02.198178665 +0000 @@ -1082,7 +1082,7 @@ if ((names == null) || (filter == null)) { return names; @@ -1086,8 +1104,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-07-23 12:25:19.873812271 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2013-02-12 00:10:02.198178665 +0000 @@ -70,7 +70,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -1098,8 +1116,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-10-11 13:55:55.878131798 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2013-02-12 00:10:02.198178665 +0000 @@ -725,7 +725,7 @@ */ @@ -1128,8 +1146,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-02-02 13:37:24.040702551 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2013-02-12 00:10:02.198178665 +0000 @@ -213,7 +213,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -1154,8 +1172,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-07-20 19:23:37.613459979 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-02-12 00:10:02.202178730 +0000 @@ -165,11 +165,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1180,8 +1198,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-07-20 19:23:37.613459979 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2013-02-12 00:10:02.202178730 +0000 @@ -84,18 +84,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1262,8 +1280,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-07-20 19:23:37.625460201 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2013-02-12 00:10:02.202178730 +0000 @@ -47,7 +47,7 @@ } } @@ -1274,8 +1292,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-07-20 19:23:37.669461020 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2013-02-02 15:57:52.098738626 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2013-02-12 00:10:02.202178730 +0000 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1296,8 +1314,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-07-20 19:23:37.669461020 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2013-02-12 00:10:02.202178730 +0000 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1308,8 +1326,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 2013-02-02 13:26:06.173831001 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2013-02-12 00:10:02.210178857 +0000 @@ -1310,7 +1310,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { @@ -1404,8 +1422,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-07-20 19:23:37.669461020 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2013-02-12 00:10:02.210178857 +0000 @@ -246,7 +246,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1512,8 +1530,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-07-20 19:23:37.673461094 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2013-02-12 00:10:02.210178857 +0000 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -1555,8 +1573,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 2013-02-02 15:37:06.035470881 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-02-12 00:09:29.305651739 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-02-12 00:10:02.210178857 +0000 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -1567,8 +1585,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-07-20 19:23:37.757462659 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2013-02-12 00:10:02.210178857 +0000 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -1606,8 +1624,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 2013-02-02 15:37:06.055471202 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2013-02-12 00:09:29.349652445 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2013-02-12 00:10:02.210178857 +0000 @@ -596,13 +596,16 @@ } @@ -1629,8 +1647,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-07-20 19:23:37.689461393 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-02-12 00:10:02.210178857 +0000 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1650,8 +1668,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-07-20 19:23:37.761462733 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2013-02-02 15:57:52.106738751 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2013-02-12 00:10:02.210178857 +0000 @@ -136,7 +136,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1662,8 +1680,8 @@ exceptionTypes, modifiers, slot, signature, diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-02-02 13:26:06.193831323 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-02-12 00:09:29.313651868 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-02-12 00:10:02.214178922 +0000 @@ -238,7 +238,7 @@ /** maps a class loader to the proxy class cache for that loader */ @@ -1692,8 +1710,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-07-20 19:23:37.769462884 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2013-02-12 00:10:02.214178922 +0000 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1704,8 +1722,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-07-20 19:23:37.717461913 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2013-02-12 00:10:02.214178922 +0000 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -1719,8 +1737,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-07-20 19:23:37.717461913 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2013-02-12 00:10:02.214178922 +0000 @@ -2282,7 +2282,7 @@ int off = 0; int next = 0; @@ -1731,8 +1749,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-07-20 19:23:37.721461989 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2013-02-12 00:10:02.214178922 +0000 @@ -1616,7 +1616,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -1758,8 +1776,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-07-20 19:23:37.721461989 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2013-02-12 00:10:02.214178922 +0000 @@ -917,7 +917,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -1779,8 +1797,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-07-20 19:23:37.785463179 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2013-02-12 00:10:02.214178922 +0000 @@ -677,7 +677,7 @@ static InetAddressImpl impl; @@ -1800,8 +1818,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-07-20 19:23:37.801463479 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2013-02-12 00:10:02.214178922 +0000 @@ -205,7 +205,7 @@ */ @@ -1812,8 +1830,8 @@ /** * Returns an input stream for reading the specified resource. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java ---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2013-02-02 15:37:06.055471202 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2013-02-12 00:09:29.361652637 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2013-02-12 00:10:02.218178986 +0000 @@ -1493,7 +1493,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -1833,8 +1851,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-07-20 19:23:37.997467129 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2013-02-12 00:10:02.218178986 +0000 @@ -124,7 +124,7 @@ this.context = null; } @@ -1845,8 +1863,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-07-20 19:23:37.997467129 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2013-02-02 15:57:52.110738816 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2013-02-12 00:10:02.218178986 +0000 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -1857,8 +1875,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-07-20 19:23:38.001467204 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2013-02-12 00:10:02.218178986 +0000 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -1882,8 +1900,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-07-20 19:23:38.009467350 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2013-02-12 00:10:02.218178986 +0000 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -1903,8 +1921,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-07-20 19:23:38.013467424 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2013-02-12 00:10:02.218178986 +0000 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -1924,8 +1942,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-07-20 19:23:38.013467424 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2013-02-12 00:10:02.218178986 +0000 @@ -368,8 +368,8 @@ int swag = 32; int vcap = 8; @@ -1938,8 +1956,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-07-20 19:23:38.013467424 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2013-02-12 00:10:02.218178986 +0000 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -1968,8 +1986,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-07-20 19:23:38.025467650 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2013-02-12 00:10:02.218178986 +0000 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -1980,8 +1998,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-07-20 19:23:38.025467650 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2013-02-12 00:10:02.218178986 +0000 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -2028,8 +2046,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-07-20 19:23:38.029467723 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2013-02-12 00:10:02.218178986 +0000 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -2067,8 +2085,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-07-20 19:23:38.029467723 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2013-02-12 00:10:02.222179049 +0000 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -2079,8 +2097,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-07-20 19:23:38.101469063 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2013-02-12 00:10:02.222179049 +0000 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -2110,8 +2128,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-07-20 19:23:38.105469139 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2013-02-02 15:57:52.114738881 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2013-02-12 00:10:02.222179049 +0000 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -2122,8 +2140,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-07-20 19:23:38.109469214 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2013-02-02 15:57:52.118738946 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2013-02-12 00:10:02.222179049 +0000 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -2749,8 +2767,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-07-20 19:23:38.141469810 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2013-02-02 15:57:52.118738946 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2013-02-12 00:10:02.222179049 +0000 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -2761,8 +2779,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-07-20 19:23:38.141469810 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2013-02-02 15:57:52.118738946 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2013-02-12 00:10:02.222179049 +0000 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -2785,8 +2803,8 @@ // readObject method for the serialization proxy pattern diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java openjdk-boot/jdk/src/share/classes/java/util/Formatter.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2013-02-02 15:37:06.035470881 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2013-02-02 15:57:52.118738946 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2013-02-12 00:09:29.305651739 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2013-02-12 00:10:02.226179114 +0000 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -2797,8 +2815,8 @@ for (int i = 0, len = s.length(); i < len; ) { if (m.find(i)) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java openjdk-boot/jdk/src/share/classes/java/util/HashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2013-02-02 15:37:06.039470946 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2013-02-02 15:57:52.118738946 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2013-02-12 00:09:29.313651868 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2013-02-12 00:10:02.226179114 +0000 @@ -868,7 +868,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -2809,8 +2827,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-07-20 19:23:38.149469956 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2013-02-02 15:57:52.118738946 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2013-02-12 00:10:02.226179114 +0000 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -2857,8 +2875,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2013-02-02 15:37:06.039470946 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2013-02-02 15:57:52.118738946 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2013-02-12 00:09:29.313651868 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2013-02-12 00:10:02.226179114 +0000 @@ -568,7 +568,7 @@ // Creates the new entry. @@ -2914,8 +2932,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-07-20 19:23:38.149469956 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2013-02-12 00:10:02.226179114 +0000 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -2935,8 +2953,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-07-20 19:23:38.157470107 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2013-02-12 00:10:02.226179114 +0000 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -2947,8 +2965,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-07-20 19:23:38.157470107 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2013-02-12 00:10:02.226179114 +0000 @@ -238,7 +238,7 @@ */ @Override @@ -2968,8 +2986,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-07-20 19:23:38.161470182 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2013-02-12 00:10:02.230179178 +0000 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -3007,8 +3025,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-07-20 19:23:38.161470182 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2013-02-12 00:10:02.230179178 +0000 @@ -187,7 +187,7 @@ return; @@ -3019,8 +3037,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-07-20 19:23:38.161470182 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2013-02-12 00:10:02.230179178 +0000 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -3031,8 +3049,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-10-11 14:09:44.593788382 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2013-02-12 00:10:02.230179178 +0000 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -3043,8 +3061,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 2013-02-02 12:57:27.502305972 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2013-02-02 16:00:23.761353319 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2013-02-12 00:10:02.230179178 +0000 @@ -458,8 +458,8 @@ // were final, the following KnownLevel implementation can be removed. // Future API change should take this into consideration. @@ -3074,9 +3092,9 @@ } list.add(o); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2013-02-02 12:57:27.506306036 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2013-02-02 15:57:52.122739009 +0000 -@@ -171,7 +171,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2013-02-12 00:10:02.230179178 +0000 +@@ -170,7 +170,7 @@ private LogManager manager; private String name; private final CopyOnWriteArrayList<Handler> handlers = @@ -3085,7 +3103,7 @@ private String resourceBundleName; private volatile boolean useParentHandlers = true; private volatile Filter filter; -@@ -1494,7 +1494,7 @@ +@@ -1505,7 +1505,7 @@ // Set our new parent. parent = newParent; if (parent.kids == null) { @@ -3095,8 +3113,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 2013-02-02 12:57:27.506306036 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2013-02-02 15:57:52.122739009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2013-02-12 00:10:02.230179178 +0000 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -3107,9 +3125,9 @@ for (; loggers.hasMoreElements();) { array.add((String) loggers.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2013-02-02 12:57:27.502305972 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2013-02-02 15:59:21.824271343 +0000 -@@ -379,7 +379,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2013-02-12 00:10:34.474695720 +0000 +@@ -375,7 +375,7 @@ } private List<LoggerContext> contexts() { @@ -3118,8 +3136,8 @@ cxs.add(systemContext); cxs.add(getUserContext()); return cxs; -@@ -387,7 +387,7 @@ - +@@ -435,7 +435,7 @@ + // added in the user context. static class LoggerContext { // Table of named Loggers that maps names to Loggers. - private final Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<>(); @@ -3127,7 +3145,7 @@ // Tree of named Loggers private final LogNode root; -@@ -561,7 +561,7 @@ +@@ -584,7 +584,7 @@ name = ""; } if (node.children == null) { @@ -3136,7 +3154,7 @@ } LogNode child = node.children.get(head); if (child == null) { -@@ -675,7 +675,7 @@ +@@ -690,7 +690,7 @@ // loggerRefQueue holds LoggerWeakRef objects for Logger objects // that have been GC'ed. private final ReferenceQueue<Logger> loggerRefQueue @@ -3145,16 +3163,7 @@ // Package-level inner class. // Helper class for managing WeakReferences to Logger objects. -@@ -897,7 +897,7 @@ - */ - public Enumeration<String> getLoggerNames() { - // only return unique names -- Set<String> names = new HashSet<>(Collections.list(systemContext.getLoggerNames())); -+ Set<String> names = new HashSet<String>(Collections.list(systemContext.getLoggerNames())); - names.addAll(Collections.list(getUserContext().getLoggerNames())); - return Collections.enumeration(names); - } -@@ -1026,7 +1026,7 @@ +@@ -1032,7 +1032,7 @@ } hands = hands.trim(); int ix = 0; @@ -3164,8 +3173,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-07-20 19:23:38.229471448 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2013-02-02 15:57:52.126739071 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2013-02-12 00:10:02.230179178 +0000 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -3177,8 +3186,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-07-20 19:23:38.233471521 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2013-02-02 15:57:52.126739071 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2013-02-12 00:10:02.234179242 +0000 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -3209,8 +3218,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-07-20 19:23:38.165470255 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2013-02-02 15:57:52.126739071 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2013-02-12 00:10:02.234179242 +0000 @@ -538,7 +538,7 @@ cursor--; else { @@ -3221,8 +3230,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-07-20 19:23:38.169470329 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2013-02-02 15:57:52.126739071 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2013-02-12 00:10:02.238179306 +0000 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -3233,8 +3242,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-07-20 19:23:38.241471669 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2013-02-02 15:57:52.126739071 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2013-02-12 00:10:02.238179306 +0000 @@ -321,7 +321,7 @@ * <td headers="matches">Nothing, but quotes all characters until <tt>\E</tt></td></tr> * <tr><td valign="top" headers="construct quot"><tt>\E</tt></td> @@ -3272,8 +3281,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-07-20 19:23:38.245471744 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2013-02-02 15:57:52.126739071 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2013-02-12 00:10:02.238179306 +0000 @@ -193,8 +193,8 @@ } }; @@ -3286,8 +3295,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-07-20 19:23:38.169470329 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2013-02-02 15:57:52.126739071 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2013-02-12 00:10:02.238179306 +0000 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -3298,8 +3307,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-07-20 19:23:38.173470405 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2013-02-02 15:57:52.130739134 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2013-02-12 00:10:02.238179306 +0000 @@ -289,7 +289,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -3364,8 +3373,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-10-11 14:17:01.245905978 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2013-02-02 15:57:52.130739134 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2013-02-12 00:10:02.238179306 +0000 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3394,8 +3403,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-07-20 19:23:38.177470480 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2013-02-12 00:10:02.238179306 +0000 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3406,8 +3415,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-07-20 19:23:38.181470553 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2013-02-12 00:10:02.242179370 +0000 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3463,8 +3472,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-07-20 19:23:38.181470553 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2013-02-12 00:10:02.242179370 +0000 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3532,8 +3541,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-07-20 19:23:38.181470553 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2013-02-12 00:10:02.242179370 +0000 @@ -171,7 +171,7 @@ /** * Reference queue for cleared WeakEntries @@ -3566,8 +3575,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-07-20 19:23:38.253471895 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2013-02-12 00:10:02.242179370 +0000 @@ -319,7 +319,7 @@ // the outstanding inputstreams that need to be closed, @@ -3596,8 +3605,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-07-20 19:23:38.253471895 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2013-02-12 00:10:02.242179370 +0000 @@ -53,8 +53,8 @@ } @@ -3609,9 +3618,40 @@ 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 2013-02-12 01:28:36.205860263 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2013-02-12 01:29:36.030824105 +0000 +@@ -84,7 +84,7 @@ + * no CryptoPermissionCollections. + */ + CryptoPermissions() { +- perms = new ConcurrentHashMap<>(7); ++ perms = new ConcurrentHashMap<String,PermissionCollection>(7); + } + + /** +@@ -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/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-07-20 19:23:38.501476510 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2013-02-12 00:10:02.242179370 +0000 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -3622,8 +3662,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-07-20 19:23:38.505476586 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2013-02-12 00:10:02.242179370 +0000 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -3634,8 +3674,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-07-20 19:23:38.497476436 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2013-02-12 00:10:02.242179370 +0000 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -3646,8 +3686,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-07-20 19:23:38.497476436 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2013-02-12 00:10:02.242179370 +0000 @@ -48,7 +48,7 @@ private Subject subject; @@ -3658,8 +3698,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 2013-02-02 15:37:06.083471650 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-02-02 15:57:52.134739198 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-02-12 00:09:29.393653149 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-02-12 00:10:02.242179370 +0000 @@ -59,7 +59,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap[n]; // unchecked warning expected here @@ -3697,8 +3737,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-07-20 19:23:39.141488428 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2013-02-12 00:10:02.246179434 +0000 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -3709,8 +3749,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-07-20 19:23:39.141488428 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2013-02-12 00:10:02.246179434 +0000 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -3721,9 +3761,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 2013-02-02 15:37:05.975469923 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-02 15:57:52.138739264 +0000 -@@ -169,7 +169,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-12 00:09:29.129648920 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-12 00:12:46.712814283 +0000 +@@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); ostream.println(PROP_SETTINGS); @@ -3732,7 +3772,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. @@ -3741,9 +3781,27 @@ for (Locale l : tlocales) { sortedSet.add(l.toString()); } +@@ -532,7 +532,7 @@ + } + + static String[] expandArgs(String[] argArray) { +- List<StdArg> aList = new ArrayList<>(); ++ List<StdArg> aList = new ArrayList<StdArg>(); + for (String x : argArray) { + aList.add(new StdArg(x)); + } +@@ -540,7 +540,7 @@ + } + + static String[] expandArgs(List<StdArg> argList) { +- ArrayList<String> out = new ArrayList<>(); ++ ArrayList<String> out = new ArrayList<String>(); + if (trace) { + System.err.println("Incoming arguments:"); + } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-07-20 19:23:39.241490287 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2013-02-12 00:10:02.246179434 +0000 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -3754,8 +3812,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-07-20 19:23:39.389493043 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2013-02-12 00:10:02.246179434 +0000 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -3784,8 +3842,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-07-20 19:23:39.405493340 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2013-02-12 00:10:02.246179434 +0000 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -3796,9 +3854,9 @@ /* 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-07-20 19:23:39.409493414 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2013-02-02 15:57:52.138739264 +0000 -@@ -2628,7 +2628,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2013-02-12 00:10:02.246179434 +0000 +@@ -2645,7 +2645,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -3807,7 +3865,7 @@ if (cachedHeaders != null) headers = cachedHeaders.getHeaders(); -@@ -2637,7 +2637,7 @@ +@@ -2654,7 +2654,7 @@ for (Map.Entry<String, List<String>> e: headers.entrySet()) { String key = e.getKey(); @@ -3817,8 +3875,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-07-20 19:23:39.393493119 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2013-02-12 00:10:02.246179434 +0000 @@ -239,7 +239,7 @@ url = null; } @@ -3829,8 +3887,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-07-20 19:23:39.433493863 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2013-02-12 00:10:02.246179434 +0000 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -3868,8 +3926,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-07-20 19:23:39.489494906 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2013-02-12 00:10:02.246179434 +0000 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -3880,8 +3938,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-07-20 19:23:39.489494906 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2013-02-12 00:10:02.246179434 +0000 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -3894,8 +3952,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-07-20 19:23:39.489494906 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2013-02-12 00:10:02.246179434 +0000 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -3906,8 +3964,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-07-20 19:23:39.489494906 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2013-02-12 00:10:02.250179498 +0000 @@ -77,7 +77,7 @@ throws IOException { @@ -3927,8 +3985,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-07-20 19:23:39.493494979 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2013-02-12 00:10:02.250179498 +0000 @@ -71,7 +71,7 @@ @Override @@ -3939,8 +3997,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-07-20 19:23:39.493494979 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2013-02-02 15:57:52.138739264 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2013-02-12 00:10:02.250179498 +0000 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -3960,8 +4018,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-07-20 19:23:39.537495800 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2013-02-12 00:10:02.250179498 +0000 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -4026,8 +4084,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-07-20 19:23:39.569496396 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2013-02-12 00:10:02.250179498 +0000 @@ -150,10 +150,10 @@ /** maps activation id to its respective group id */ @@ -4055,8 +4113,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-07-20 19:23:39.593496840 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2013-02-12 00:10:02.250179498 +0000 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -4067,8 +4125,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-07-20 19:23:39.593496840 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2013-02-12 00:10:02.250179498 +0000 @@ -41,15 +41,15 @@ // or principal. // @@ -4109,8 +4167,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-07-20 19:23:39.593496840 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2013-02-12 00:10:02.250179498 +0000 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -4130,8 +4188,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-07-20 19:23:39.605497067 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2013-02-12 00:10:02.250179498 +0000 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -4169,8 +4227,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-07-20 19:23:39.605497067 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2013-02-12 00:10:02.250179498 +0000 @@ -40,7 +40,7 @@ public class Providers { @@ -4181,8 +4239,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-07-20 19:23:39.617497285 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2013-02-12 00:10:02.250179498 +0000 @@ -267,7 +267,7 @@ if (ktabs.isEmpty()) { return kk.toArray(new KerberosKey[kk.size()]); @@ -4193,8 +4251,8 @@ for (KerberosKey k: ktab.getKeys(kp)) { keys.add(k); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2012-07-20 19:23:39.625497435 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2013-02-12 00:10:02.250179498 +0000 @@ -551,7 +551,7 @@ } }))); @@ -4272,8 +4330,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-07-20 19:23:39.637497662 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2013-02-12 00:10:02.254179563 +0000 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4284,8 +4342,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-07-20 19:23:39.637497662 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2013-02-02 15:57:52.142739329 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2013-02-12 00:10:02.258179626 +0000 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4296,8 +4354,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-07-20 19:23:39.653497957 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2013-02-12 00:10:02.258179626 +0000 @@ -490,7 +490,7 @@ private static String exec(String c) { @@ -4308,8 +4366,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-07-20 19:23:39.661498108 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2013-02-12 00:10:02.258179626 +0000 @@ -257,7 +257,7 @@ + configName); } @@ -4320,8 +4378,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-07-20 19:23:39.637497662 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2013-02-12 00:10:02.258179626 +0000 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4332,8 +4390,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-07-20 19:23:39.641497735 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2013-02-12 00:10:02.258179626 +0000 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -4353,8 +4411,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-07-20 19:23:39.641497735 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2013-02-12 00:10:02.258179626 +0000 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -4383,8 +4441,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-07-20 19:23:39.641497735 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2013-02-12 00:10:02.258179626 +0000 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4395,8 +4453,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-07-20 19:23:39.645497808 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2013-02-12 00:10:02.258179626 +0000 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -4407,8 +4465,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-07-20 19:23:39.645497808 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2013-02-12 00:10:02.258179626 +0000 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4419,8 +4477,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-07-20 19:23:39.645497808 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2013-02-12 00:10:02.258179626 +0000 @@ -259,7 +259,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -4431,8 +4489,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 2013-02-02 15:37:06.059471266 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-02-12 00:09:29.361652637 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2013-02-12 00:10:02.262179690 +0000 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -4470,8 +4528,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-07-20 19:23:39.649497882 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2013-02-12 00:10:02.262179690 +0000 @@ -77,7 +77,7 @@ */ @@ -4482,8 +4540,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-07-20 19:23:39.629497511 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-02-12 00:10:02.262179690 +0000 @@ -462,7 +462,7 @@ */ static class KdcAccessibility { @@ -4506,8 +4564,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-07-20 19:23:39.633497587 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2013-02-12 00:10:02.262179690 +0000 @@ -238,7 +238,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -4527,8 +4585,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-07-20 19:23:39.633497587 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2013-02-12 00:10:02.262179690 +0000 @@ -359,14 +359,14 @@ } @@ -4547,8 +4605,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-07-20 19:23:39.717499150 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2013-02-02 15:57:52.146739394 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2013-02-12 00:10:02.262179690 +0000 @@ -590,7 +590,7 @@ // Except the performance improvement, another benefit is to break // the dead loop while looking for the issuer back and forth @@ -4559,8 +4617,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-07-20 19:23:39.705498923 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2013-02-12 00:10:02.262179690 +0000 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -4571,8 +4629,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-07-20 19:23:39.705498923 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2013-02-12 00:10:02.262179690 +0000 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -4628,8 +4686,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-07-20 19:23:39.709498997 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2013-02-12 00:10:02.262179690 +0000 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -4640,8 +4698,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-07-20 19:23:39.709498997 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2013-02-12 00:10:02.262179690 +0000 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4652,8 +4710,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-07-20 19:23:39.709498997 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2013-02-12 00:10:02.262179690 +0000 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -4699,8 +4757,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-07-20 19:23:39.741499593 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2013-02-12 00:10:02.262179690 +0000 @@ -219,7 +219,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -4711,8 +4769,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-07-20 19:23:39.741499593 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2013-02-12 00:10:02.262179690 +0000 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -4723,8 +4781,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-07-20 19:23:39.749499746 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2013-02-12 00:10:02.266179755 +0000 @@ -393,7 +393,7 @@ // Map BulkCipher -> Boolean(available) @@ -4735,8 +4793,8 @@ // descriptive name including key size, e.g. AES/128 final String description; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-02-02 13:25:00.900783271 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-02-02 15:57:52.150739457 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-02-12 00:10:02.266179755 +0000 @@ -659,7 +659,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -4765,8 +4823,8 @@ if (suite != CipherSuite.C_SCSV) { cipherList.add(suite); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2013-02-02 13:24:11.023982539 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2013-02-12 00:10:02.266179755 +0000 @@ -260,7 +260,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -4804,8 +4862,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-10-11 14:12:50.265250339 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-02-12 00:10:02.266179755 +0000 @@ -569,7 +569,7 @@ activeProtocols = getActiveProtocols(); } @@ -4825,8 +4883,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-07-20 19:23:39.753499822 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2013-02-12 00:10:02.270179819 +0000 @@ -169,7 +169,7 @@ return name; } @@ -4846,8 +4904,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-07-20 19:23:39.757499897 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2013-02-12 00:10:02.270179819 +0000 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -4858,8 +4916,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 2013-02-02 13:24:11.035982732 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-02-12 00:10:02.270179819 +0000 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -4897,8 +4955,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-07-20 19:23:39.761499971 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2013-02-12 00:10:02.270179819 +0000 @@ -261,7 +261,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -4945,8 +5003,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-07-20 19:23:39.761499971 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2013-02-12 00:10:02.270179819 +0000 @@ -331,7 +331,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -4975,8 +5033,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-07-20 19:23:39.765500043 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-02-12 00:10:02.270179819 +0000 @@ -618,7 +618,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. @@ -4996,8 +5054,8 @@ Object securityCtx = SecureKey.getCurrentSecurityContext(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2012-07-20 19:23:39.765500043 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-02-12 00:10:02.270179819 +0000 @@ -2512,7 +2512,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -5008,8 +5066,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-07-20 19:23:39.769500115 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2013-02-02 15:57:52.154739519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2013-02-12 00:10:02.274179883 +0000 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -5029,8 +5087,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-07-20 19:23:39.769500115 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2013-02-02 15:57:52.158739583 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2013-02-12 00:10:02.274179883 +0000 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -5041,8 +5099,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-07-20 19:23:39.769500115 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2013-02-02 15:57:52.158739583 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2013-02-12 00:10:02.274179883 +0000 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -5062,8 +5120,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-07-20 19:23:39.777500265 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-02-02 15:57:52.158739583 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-02-12 00:10:02.274179883 +0000 @@ -123,14 +123,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -5145,8 +5203,8 @@ KeyStore caks = KeyTool.getCacertsKeyStore(); if (caks != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-02 15:37:06.059471266 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-02 15:57:52.158739583 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-12 00:09:29.365652701 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2013-02-12 00:10:02.274179883 +0000 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -5217,8 +5275,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-07-20 19:23:39.785500417 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2013-02-02 15:57:52.158739583 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2013-02-12 00:10:02.278179947 +0000 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -5256,8 +5314,8 @@ super(i, b); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-02 15:37:06.059471266 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-02 15:57:52.158739583 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-12 00:09:29.365652701 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2013-02-12 00:10:02.282180011 +0000 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -5268,8 +5326,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-07-20 19:23:39.837501381 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2013-02-02 15:57:52.162739647 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2013-02-12 00:10:02.282180011 +0000 @@ -1260,7 +1260,7 @@ if (exts == null) { return null; @@ -5317,8 +5375,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-07-20 19:23:39.837501381 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2013-02-12 00:10:02.282180011 +0000 @@ -352,7 +352,7 @@ if (extensions == null) { return null; @@ -5347,8 +5405,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-07-20 19:23:39.837501381 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2013-02-12 00:10:02.282180011 +0000 @@ -104,8 +104,8 @@ private X500Principal issuerPrincipal = null; private Date thisUpdate = null; @@ -5379,8 +5437,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-07-20 19:23:40.001504436 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2013-02-12 00:10:02.282180011 +0000 @@ -95,7 +95,7 @@ * Run the converter */ @@ -5391,8 +5449,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-07-20 19:23:40.045505256 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2013-02-12 00:10:02.282180011 +0000 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -5507,8 +5565,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-07-20 19:23:40.049505332 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2013-02-12 00:10:02.282180011 +0000 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -5564,8 +5622,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-07-20 19:23:40.049505332 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2013-02-12 00:10:02.282180011 +0000 @@ -81,7 +81,7 @@ } @@ -5593,8 +5651,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-07-20 19:23:40.049505332 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-02-12 00:10:02.282180011 +0000 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -5631,8 +5689,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-07-20 19:23:40.041505180 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2013-02-12 00:10:02.286180075 +0000 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -5652,8 +5710,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-07-20 19:23:40.049505332 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2013-02-12 00:10:02.286180075 +0000 @@ -113,7 +113,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -5682,8 +5740,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-07-20 19:23:40.285509724 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2013-02-12 00:10:02.286180075 +0000 @@ -160,7 +160,7 @@ } @@ -5718,8 +5776,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-07-20 19:23:40.285509724 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2013-02-12 00:10:02.286180075 +0000 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -5732,8 +5790,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-07-20 19:23:40.289509796 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2013-02-02 15:57:52.166739712 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2013-02-12 00:10:02.286180075 +0000 @@ -134,7 +134,7 @@ throws IOException { @@ -5744,8 +5802,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-07-20 19:23:40.289509796 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2013-02-12 00:10:02.286180075 +0000 @@ -157,7 +157,7 @@ @Override @@ -5846,8 +5904,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-07-20 19:23:40.289509796 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2013-02-12 00:10:02.286180075 +0000 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -5858,8 +5916,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-07-20 19:23:40.741518216 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2013-02-12 00:10:02.286180075 +0000 @@ -68,7 +68,7 @@ // We cache the C environment. This means that subsequent calls // to putenv/setenv from C will not be visible from Java code. @@ -5870,8 +5928,8 @@ // so that earlier variables override later ones. for (int i = environ.length-1; i > 0; i-=2) diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-02 15:37:06.059471266 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-12 00:09:29.365652701 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2013-02-12 00:10:02.290180139 +0000 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -5936,8 +5994,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-07-20 19:23:40.841520076 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-12 00:10:02.290180139 +0000 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -5957,8 +6015,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-07-20 19:23:40.845520151 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-02-12 00:10:02.290180139 +0000 @@ -130,7 +130,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); @@ -5969,8 +6027,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-07-20 19:23:40.857520374 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2013-02-12 00:10:02.290180139 +0000 @@ -153,12 +153,12 @@ static { @@ -5989,8 +6047,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-07-20 19:23:40.861520449 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2013-02-12 00:10:02.290180139 +0000 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -6010,8 +6068,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-07-20 19:23:40.861520449 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2013-02-12 00:10:02.290180139 +0000 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -6022,8 +6080,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-07-20 19:23:40.865520522 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2013-02-12 00:10:02.290180139 +0000 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -6034,8 +6092,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-07-20 19:23:40.865520522 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2013-02-02 15:57:52.170739776 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2013-02-12 00:10:02.290180139 +0000 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -6055,8 +6113,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-07-20 19:23:40.865520522 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2013-02-12 00:10:02.290180139 +0000 @@ -83,7 +83,7 @@ } @@ -6067,8 +6125,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-07-20 19:23:40.869520594 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2013-02-12 00:10:02.290180139 +0000 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -6079,8 +6137,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-07-20 19:23:41.077524466 +0100 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2013-02-12 00:10:02.294180203 +0000 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -6102,8 +6160,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-07-20 19:23:41.117525212 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-02-12 00:10:02.294180203 +0000 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -6114,8 +6172,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-07-20 19:23:41.133525512 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2013-02-12 00:10:02.294180203 +0000 @@ -128,7 +128,7 @@ } @@ -6126,8 +6184,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-07-20 19:23:41.133525512 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2013-02-12 00:10:02.294180203 +0000 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -6138,8 +6196,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-07-20 19:23:41.137525585 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2013-02-12 00:10:02.294180203 +0000 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -6150,8 +6208,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-07-20 19:23:41.137525585 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2013-02-12 00:10:02.294180203 +0000 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -6198,8 +6256,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-07-20 19:23:41.765537280 +0100 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2013-02-12 00:10:02.294180203 +0000 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -6210,8 +6268,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-07-20 19:23:41.961540926 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2013-02-12 00:10:02.294180203 +0000 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -6222,8 +6280,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-07-20 19:23:41.957540854 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2013-02-12 00:10:02.294180203 +0000 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -6234,8 +6292,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-07-20 19:23:41.997541594 +0100 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2013-02-12 00:10:02.294180203 +0000 @@ -103,7 +103,7 @@ } } @@ -6246,8 +6304,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-07-20 19:23:44.429586875 +0100 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2013-02-12 00:10:02.294180203 +0000 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -6258,8 +6316,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-07-20 19:23:44.353585458 +0100 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2013-02-02 15:57:52.174739840 +0000 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2013-02-11 21:40:56.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2013-02-12 00:10:02.298180267 +0000 @@ -59,7 +59,7 @@ } }
--- a/patches/boot/ecj-multicatch.patch Tue Feb 05 09:40:10 2013 +0000 +++ b/patches/boot/ecj-multicatch.patch Tue Feb 12 02:54:56 2013 +0000 @@ -233,19 +233,3 @@ throw new InternalError(e.toString()); } catch (InvocationTargetException e) { Throwable t = e.getCause(); -diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-02-02 16:22:25.819214619 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-02-02 16:24:35.213314506 +0000 -@@ -396,8 +396,10 @@ - (java.io.ObjectStreamField[])pf.get(type); - return translateFields(fields); - } -- } catch (NoSuchFieldException | IllegalAccessException | -- IllegalArgumentException | ClassCastException e) { -+ } catch (NoSuchFieldException e) { -+ } catch (IllegalAccessException e) { -+ } catch (IllegalArgumentException e) { -+ } catch (ClassCastException e) { - } - return null; - }
--- a/patches/boot/ecj-trywithresources.patch Tue Feb 05 09:40:10 2013 +0000 +++ b/patches/boot/ecj-trywithresources.patch Tue Feb 12 02:54:56 2013 +0000 @@ -1057,3 +1057,29 @@ } catch (IOException x) { } return result; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-12 01:56:53.097168690 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-12 02:12:21.112109410 +0000 +@@ -555,8 +555,9 @@ + if (parent == null) { + parent = new File("."); + } +- try (DirectoryStream<Path> dstream = +- Files.newDirectoryStream(parent.toPath(), glob)) { ++ DirectoryStream<Path> dstream = null; ++ try { ++ dstream = Files.newDirectoryStream(parent.toPath(), glob); + int entries = 0; + for (Path p : dstream) { + out.add(p.normalize().toString()); +@@ -572,6 +573,10 @@ + System.err.print(e); + } + } ++ finally { ++ if (dstream != null) ++ try { dstream.close(); } catch (IOException ex) {} ++ } + } else { + out.add(a.arg); + }