/hg/icedtea7: Bump to icedtea-2.7.0pre01.

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Sep 9 01:38:41 UTC 2015


changeset 761344512703 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=761344512703
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Sep 08 23:46:03 2015 +0100

	Bump to icedtea-2.7.0pre01.

	Upstream changes:
	  - OPENJDK7-01: Allow OpenJDK to build on PaX-enabled kernels
	  - OPENJDK7-02: Fix build where PAX_COMMAND is not specified
	  - OPENJDK7-03: Only apply PaX-marking when needed by a running PaX kernel
	  - OPENJDK7-04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit
	  - OPENJDK7-05: Fix mistake in 8075374 backport
	  - PR2487: Make jdk8 mode the default for jdk.tls.ephemeralDHKeySize
	  - PR2501: libjavasctp.so doesn't need to link against libdl when linking against libsctp
	  - PR2502: Remove -fno-tree-vectorize workaround now http://gcc.gnu.org/PR63341 is fixed
	  - PR2503: Add existence check for all optional dependencies in jdk_generic_profile.sh
	  - PR2521: Systems with a GLib without libgio segfault when obtaining proxy information
	  - PR2568: openjdk causes a full desktop crash on RHEL 6 i586
	  - S7105883, PR2560: JDWP: agent crash if there exists a ThreadGroup with null name
	  - S7124253: [macosx] Flavor change notification not coming
	  - S8007219: [macosx] Frame size reverts meaning of maximized attribute if frame size close to display
	  - S8013581: [macosx] Key Bindings break with awt GraphicsEnvironment setFullScreenWindow
	  - S8014464: Update jcheck for OpenJDK 7
	  - S8016105, PR2560: Add complementary RETURN_NULL allocation macros in allocation.hpp
	  - S8020210: [macosx] JVM crashes in CWrapper$NSWindow.screen(long)
	  - S8021897, PR2560: EXCEPTION_ACCESS_VIOLATION on debugging String.contentEquals()
	  - S8022683, PR2560: JNI GetStringUTFChars should return NULL on allocation failure not abort the VM
	  - S8025922, PR2560: JNI access to Strings need to check if the value field is non-null
	  - S8027058: sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Failed to initialize connector
	  - S8027561: [macosx] Cleanup "may not respond to selector" warnings in native code
	  - S8028617: Dvorak keyboard mapping not honored when ctrl key pressed
	  - S8029868: Fix KSS issues in sun.lwawt.macosx
	  - S8042205: javax/management/monitor/*: some tests didn't  get all the notifications
	  - S8043201: Deprecate RC4 in SunJSSE provider
	  - S8043202: Prohibit RC4 cipher suites
	  - S8046817: JDK 8 schemagen tool does not generate xsd files for enum types
	  - S8048194: GSSContext.acceptSecContext fails when a supported mech is not initiator preferred
	  - S8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
	  - S8064546: CipherInputStream throws BadPaddingException if stream is not fully read
	  - S8065764: javax/management/monitor/CounterMonitorTest.java hangs
	  - S8066952: [TEST-BUG] javax/management/monitor/CounterMonitorTest.java hangs
	  - S8067694: Improved certification checking
	  - S8068674: Increment minor version of HSx for 7u85 and initialize the build number
	  - S8071668: [macosx] Clipboard does not work with 3rd parties Clipboard Managers
	  - S8071715: Tune font layout engine
	  - S8071731: Better scaling for C1
	  - S8072490: Better font morphing redux
	  - S8072887: Better font handling improvements
	  - S8073334: Improved font substitutions
	  - S8073357: schema1.xsd has wrong content. Sequence of the enum values has been changed
	  - S8073385: Bad error message on parsing illegal character in XML attribute
	  - S8073773: Presume path preparedness
	  - S8073894: Getting to the root of certificate chains
	  - S8074098: 2D_Font/Bug8067699 test fails with SIGBUS crash on Solaris Sparc
	  - S8074297: substring in XSLT returns wrong character if string contains supplementary chars
	  - S8074312: Enable hotspot builds on 4.x Linux kernels
	  - S8074330: Set font anchors more solidly
	  - S8074335: Substitute for substitution formats
	  - S8074865: General crypto resilience changes
	  - S8074871: Adjust device table handling
	  - S8075374: Responding to OCSP responses
	  - S8075378: JNDI DnsClient Exception Handling
	  - S8075575: com/sun/security/auth/login/ConfigFile/InconsistentError.java failed in certain env.
	  - S8075576: com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java failed in certain env.
	  - S8075667: (tz) Support tzdata2015b
	  - S8075738: Better multi-JVM sharing
	  - S8075833: Straighter Elliptic Curves
	  - S8075838: Method for typing MethodTypes
	  - S8075853: Proxy for MBean proxies
	  - S8076290: JCK test api/xsl/conf/string/string17 starts failing after JDK-8074297
	  - S8076328: Enforce key exchange constraints
	  - S8076376: Enhance IIOP operations
	  - S8076397: Better MBean connections
	  - S8076401: Serialize OIS data
	  - S8076405: Improve serial serialization
	  - S8076409: Reinforce RMI framework
	  - S8077520: Morph tables into improved form
	  - S8077685: (tz) Support tzdata2015d
	  - S8078348: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with BindException
	  - S8078439: SPNEGO auth fails if client proposes MS krb5 OID
	  - S8078529: Increment the build value to b02 for hs24.85 in 8u85
	  - S8078562: Add modified dates
	  - S8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
	  - S8080318: jdk8u51 l10n resource file translation update
	  - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies
	  - S8081622: Increment the build value to b03 for hs24.85 in 8u51
	  - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12

	2015-09-08  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(JDK_UPDATE_VERSION): Set to 85.
		(BUILD_VERSION): Set to b01.
		(CORBA_CHANGESET): Update to icedtea-2.7.0pre01.
		(JAXP_CHANGESET): Likewise.
		(JAXWS_CHANGESET): Likewise.
		(JDK_CHANGESET): Likewise.
		(LANGTOOLS_CHANGESET): Likewise.
		(OPENJDK_CHANGESET): Likewise.
		(CORBA_SHA256SUM): Likewise.
		(JAXP_SHA256SUM): Likewise.
		(JAXWS_SHA256SUM): Likewise.
		(JDK_SHA256SUM): Likewise.
		(LANGTOOLS_SHA256SUM): Likewise.
		(OPENJDK_SHA256SUM): Likewise.
		* NEWS: Updated.
		* configure.ac: Bump to 2.7.0pre01.
		* hotspot.map.in: Update to icedtea-2.7.0pre01.
		* patches/boot/ecj-diamond.patch:
		Regenerate and fix all current cases,
		including in MacOS X and Windows Java code.
		* patches/boot/ecj-multicatch.patch:
		Update cases in javax.crypto.CipherInputStream and
		sun.security.ssl.ECDHCrypt.
		* patches/boot/ecj-trywithresources.patch:
		Regenerated.


diffstat:

 ChangeLog                               |    29 +
 Makefile.am                             |    30 +-
 NEWS                                    |     9 +
 configure.ac                            |     2 +-
 hotspot.map.in                          |     2 +-
 patches/boot/ecj-diamond.patch          |  1408 +++++++++++++++++-------------
 patches/boot/ecj-multicatch.patch       |   359 ++++---
 patches/boot/ecj-trywithresources.patch |   339 +++---
 8 files changed, 1203 insertions(+), 975 deletions(-)

diffs (truncated from 4629 to 500 lines):

diff -r 1b288e2ae365 -r 761344512703 ChangeLog
--- a/ChangeLog	Fri Aug 21 18:36:10 2015 +0100
+++ b/ChangeLog	Tue Sep 08 23:46:03 2015 +0100
@@ -1,3 +1,32 @@
+2015-09-08  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Set to 85.
+	(BUILD_VERSION): Set to b01.
+	(CORBA_CHANGESET): Update to icedtea-2.7.0pre01.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* NEWS: Updated.
+	* configure.ac: Bump to 2.7.0pre01.
+	* hotspot.map.in: Update to icedtea-2.7.0pre01.
+	* patches/boot/ecj-diamond.patch:
+	Regenerate and fix all current cases,
+	including in MacOS X and Windows Java code.
+	* patches/boot/ecj-multicatch.patch:
+	Update cases in javax.crypto.CipherInputStream and
+	sun.security.ssl.ECDHCrypt.
+	* patches/boot/ecj-trywithresources.patch:
+	Regenerated.
+
 2015-08-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Replace temporary OpenJDK 7
diff -r 1b288e2ae365 -r 761344512703 Makefile.am
--- a/Makefile.am	Fri Aug 21 18:36:10 2015 +0100
+++ b/Makefile.am	Tue Sep 08 23:46:03 2015 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 80
-BUILD_VERSION = b32
+JDK_UPDATE_VERSION = 85
+BUILD_VERSION = b01
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = e3445769412d
-JAXP_CHANGESET = e3b08dc13807
-JAXWS_CHANGESET = 299588405837
-JDK_CHANGESET = 2db5e90a399b
-LANGTOOLS_CHANGESET = bc95d2472055
-OPENJDK_CHANGESET = dbfa75121aca
-
-CORBA_SHA256SUM = 5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb
-JAXP_SHA256SUM = 8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07
-JAXWS_SHA256SUM = 816a6d7a4bd302871d73f5681f6b35459000d76bfb9fa04b3479ffb630dc39f5
-JDK_SHA256SUM = 900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c
-LANGTOOLS_SHA256SUM = 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661
-OPENJDK_SHA256SUM = 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b
+CORBA_CHANGESET = 2545636482d6
+JAXP_CHANGESET = ffbe529eeac7
+JAXWS_CHANGESET = b9776fab65b8
+JDK_CHANGESET = 15db078b2bfd
+LANGTOOLS_CHANGESET = 9c6e1de67d7d
+OPENJDK_CHANGESET = 39b2c4354d0a
+
+CORBA_SHA256SUM = cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8
+JAXP_SHA256SUM = c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb
+JAXWS_SHA256SUM = 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f
+JDK_SHA256SUM = 54f219248d47a8cfa35e43900533fb4627e7e54d3acb00ff4ce42a5d738e1338
+LANGTOOLS_SHA256SUM = 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43
+OPENJDK_SHA256SUM = 43cf43cdd1c147f43e5ce911d39fa04cd612cc68ca9e0f277e7621f65d69e8b5
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
diff -r 1b288e2ae365 -r 761344512703 NEWS
--- a/NEWS	Fri Aug 21 18:36:10 2015 +0100
+++ b/NEWS	Tue Sep 08 23:46:03 2015 +0100
@@ -14,6 +14,15 @@
 
 New in release 2.7.0 (201X-XX-XX):
 
+* Backports
+  - S7105883, PR2560: JDWP: agent crash if there exists a ThreadGroup with null name
+  - S8016105, PR2560: Add complementary RETURN_NULL allocation macros in allocation.hpp
+  - S8021897, PR2560: EXCEPTION_ACCESS_VIOLATION on debugging String.contentEquals()
+  - S8022683, PR2560: JNI GetStringUTFChars should return NULL on allocation failure not abort the VM
+  - S8025922, PR2560: JNI access to Strings need to check if the value field is non-null
+* Bug fixes
+  - PR2568: openjdk causes a full desktop crash on RHEL 6 i586
+
 New in release 2.5.6 (2015-07-22):
 
 * Security fixes
diff -r 1b288e2ae365 -r 761344512703 configure.ac
--- a/configure.ac	Fri Aug 21 18:36:10 2015 +0100
+++ b/configure.ac	Tue Sep 08 23:46:03 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.7pre00], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.7.0pre01], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
diff -r 1b288e2ae365 -r 761344512703 hotspot.map.in
--- a/hotspot.map.in	Fri Aug 21 18:36:10 2015 +0100
+++ b/hotspot.map.in	Tue Sep 08 23:46:03 2015 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 94f15794d5e7 8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ aea5b566bfab 371a10155939433fcc852a8639a05123e2a083db819f2dc4ce2588b918107345
diff -r 1b288e2ae365 -r 761344512703 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch	Fri Aug 21 18:36:10 2015 +0100
+++ b/patches/boot/ecj-diamond.patch	Tue Sep 08 23:46:03 2015 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-06-12 23:34:39.974231621 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-09-08 10:49:08.166659745 +0100
 @@ -58,7 +58,7 @@
      private CorbaConnection conn;
  
@@ -11,8 +11,8 @@
      public static synchronized void cleanCache( ORB orb ) {
          synchronized (iorMapLock) {
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-09-08 10:49:08.166659745 +0100
 @@ -50,7 +50,7 @@
       */
      private class HookPutFields extends ObjectOutputStream.PutField
@@ -23,8 +23,8 @@
          /**
           * Put the value of the named boolean field into the persistent field.
 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	2015-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-09-08 10:49:08.166659745 +0100
 @@ -1315,7 +1315,7 @@
      protected void shutdownServants(boolean wait_for_completion) {
          Set<ObjectAdapterFactory> oaset;
@@ -35,8 +35,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	2015-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-09-08 10:49:08.170659672 +0100
 @@ -108,7 +108,7 @@
      private ThreadGroup threadGroup;
  
@@ -56,8 +56,8 @@
  
          for (WorkerThread wt : copy) {
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-06-12 17:38:32.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-09-08 10:49:08.170659672 +0100
 @@ -173,7 +173,7 @@
          _parser = new Parser(this, useServicesMechanism);
          _featureManager = featureManager;
@@ -68,8 +68,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-06-12 23:14:47.187405507 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-09-08 10:42:12.326246207 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-09-08 10:49:08.170659672 +0100
 @@ -297,8 +297,8 @@
      //
      private final static class EncodingInfos {
@@ -90,9 +90,123 @@
                  while (keys.hasMoreElements()) {
                      final String javaName = (String) keys.nextElement();
                      final String[] mimes = parseMimeTypes(props.getProperty(javaName));
+diff -Nru openjdk-boot.orig/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java openjdk-boot/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
+--- openjdk-boot.orig/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java	2015-09-08 10:59:12.811712492 +0100
++++ openjdk-boot/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java	2015-09-08 11:02:33.908091482 +0100
+@@ -68,10 +68,10 @@
+     // JVM info properties
+     private File runtime = null;
+     private String mainClassName = null;
+-    private ArrayList<File> classPath = new ArrayList<>();
+-    private ArrayList<File> nativeLibraries = new ArrayList<>();
+-    private ArrayList<String> options = new ArrayList<>();
+-    private ArrayList<String> arguments = new ArrayList<>();
++    private ArrayList<File> classPath = new ArrayList<File>();
++    private ArrayList<File> nativeLibraries = new ArrayList<File>();
++    private ArrayList<String> options = new ArrayList<String>();
++    private ArrayList<String> arguments = new ArrayList<String>();
+ 
+     public static final String EXECUTABLE_NAME = "JavaAppLauncher";
+     public static final String DEFAULT_ICON_NAME = "GenericApp.icns";
+diff -Nru openjdk-boot.orig/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java openjdk-boot/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java
+--- openjdk-boot.orig/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java	2015-09-08 10:59:12.827712204 +0100
++++ openjdk-boot/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java	2015-09-08 11:04:42.805775341 +0100
+@@ -41,7 +41,7 @@
+ 
+ abstract class AquaPainter <T extends JRSUIState> {
+     static <T extends JRSUIState> AquaPainter<T> create(final T state) {
+-        return new AquaSingleImagePainter<>(state);
++        return new AquaSingleImagePainter<T>(state);
+     }
+ 
+     static <T extends JRSUIState> AquaPainter<T> create(final T state, final int minWidth, final int minHeight, final int westCut, final int eastCut, final int northCut, final int southCut) {
+@@ -62,7 +62,7 @@
+     }
+ 
+     static <T extends JRSUIState> AquaPainter<T> create(final T state, final NineSliceMetricsProvider metricsProvider) {
+-        return new AquaNineSlicingImagePainter<>(state, metricsProvider);
++        return new AquaNineSlicingImagePainter<T>(state, metricsProvider);
+     }
+ 
+     abstract void paint(Graphics2D g, T stateToPaint);
+@@ -103,7 +103,7 @@
+         AquaNineSlicingImagePainter(final T state, final NineSliceMetricsProvider metricsProvider) {
+             super(new JRSUIControl(false), state);
+             this.metricsProvider = metricsProvider;
+-            slicedControlImages = new HashMap<>();
++            slicedControlImages = new HashMap<T, RecyclableJRSUISliceImageControl>();
+         }
+ 
+         @Override
+diff -Nru openjdk-boot.orig/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java openjdk-boot/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java
+--- openjdk-boot.orig/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java	2015-09-08 10:59:12.839711988 +0100
++++ openjdk-boot/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java	2015-09-08 11:04:02.974490668 +0100
+@@ -210,7 +210,7 @@
+         private Map<K, V> refs;
+ 
+         V get(final K key) {
+-            if (refs == null) refs = new HashMap<>();
++	    if (refs == null) refs = new HashMap<K, V>();
+ 
+             final V cachedValue = refs.get(key);
+             if (cachedValue != null) return cachedValue;
+diff -Nru openjdk-boot.orig/jdk/src/macosx/classes/com/apple/laf/ImageCache.java openjdk-boot/jdk/src/macosx/classes/com/apple/laf/ImageCache.java
+--- openjdk-boot.orig/jdk/src/macosx/classes/com/apple/laf/ImageCache.java	2015-09-08 10:59:12.851711771 +0100
++++ openjdk-boot/jdk/src/macosx/classes/com/apple/laf/ImageCache.java	2015-09-08 11:03:39.998903445 +0100
+@@ -41,7 +41,7 @@
+  */
+ final class ImageCache {
+     // Ordered Map keyed by args hash, ordered by most recent accessed entry.
+-    private final LinkedHashMap<Integer, PixelCountSoftReference> map = new LinkedHashMap<>(16, 0.75f, true);
++    private final LinkedHashMap<Integer, PixelCountSoftReference> map = new LinkedHashMap<Integer, PixelCountSoftReference>(16, 0.75f, true);
+ 
+     // Maximum number of pixels to cache, this is used if maxCount
+     private final int maxPixelCount;
+@@ -51,7 +51,7 @@
+     // Lock for concurrent access to map
+     private final ReadWriteLock lock = new ReentrantReadWriteLock();
+     // Reference queue for tracking lost softreferences to images in the cache
+-    private final ReferenceQueue<Image> referenceQueue = new ReferenceQueue<>();
++    private final ReferenceQueue<Image> referenceQueue = new ReferenceQueue<Image>();
+ 
+     // Singleton Instance
+     private static final RecyclableSingleton<ImageCache> instance = new RecyclableSingleton<ImageCache>() {
+diff -Nru openjdk-boot.orig/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java openjdk-boot/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java
+--- openjdk-boot.orig/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java	2015-09-08 10:59:12.863711555 +0100
++++ openjdk-boot/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java	2015-09-08 11:01:39.785065121 +0100
+@@ -88,7 +88,7 @@
+     private native void deregisterDisplayReconfiguration(long context);
+ 
+     /** Available CoreGraphics displays. */
+-    private final Map<Integer, CGraphicsDevice> devices = new HashMap<>(5);
++    private final Map<Integer, CGraphicsDevice> devices = new HashMap<Integer, CGraphicsDevice>(5);
+ 
+     /** Reference to the display reconfiguration callback context. */
+     private final long displayReconfigContext;
+@@ -143,7 +143,7 @@
+      */
+     private void initDevices() {
+         synchronized (this) {
+-            final Map<Integer, CGraphicsDevice> old = new HashMap<>(devices);
++	    final Map<Integer, CGraphicsDevice> old = new HashMap<Integer, CGraphicsDevice>(devices);
+             devices.clear();
+ 
+             int mainID = getMainDisplayID();
+diff -Nru openjdk-boot.orig/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java openjdk-boot/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
+--- openjdk-boot.orig/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java	2015-09-08 10:59:12.875711338 +0100
++++ openjdk-boot/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java	2015-09-08 11:00:04.922773260 +0100
+@@ -86,7 +86,7 @@
+         fd1 = (int)fds;
+         kqueueWrapper = new KQueueArrayWrapper();
+         kqueueWrapper.initInterrupt(fd0, fd1);
+-        fdMap = new HashMap<>();
++        fdMap = new HashMap<Integer,MapEntry>();
+         totalChannels = 1;
+     }
+ 
 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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-09-08 10:49:08.170659672 +0100
 @@ -63,9 +63,10 @@
   */
  public final class DocumentHandler extends DefaultHandler {
@@ -108,8 +222,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-09-08 10:49:08.170659672 +0100
 @@ -46,7 +46,7 @@
   */
  public final class TypeResolver {
@@ -129,8 +243,8 @@
                      CACHE.put(actual, map);
                  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-09-08 10:49:08.170659672 +0100
 @@ -45,7 +45,7 @@
      private final Kind keyKind; // a reference kind for the cache keys
      private final Kind valueKind; // a reference kind for the cache values
@@ -177,8 +291,8 @@
          };
  
 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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-09-08 10:49:08.170659672 +0100
 @@ -104,9 +104,9 @@
          return this.def.compareTo(that.def);
      }
@@ -250,8 +364,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	2015-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-09-08 10:42:12.558241960 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-09-08 10:49:08.170659672 +0100
 @@ -257,7 +257,7 @@
          assert(basicCodings[_meta_default] == null);
          assert(basicCodings[_meta_canon_min] != null);
@@ -314,8 +428,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	2015-06-12 23:14:47.135406443 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-09-08 10:42:12.262247378 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-09-08 10:49:08.170659672 +0100
 @@ -466,7 +466,7 @@
  
      void readInnerClasses(Class cls) throws IOException {
@@ -326,8 +440,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-09-08 10:49:08.170659672 +0100
 @@ -743,9 +743,9 @@
          // Steps 1/2/3 are interdependent, and may be iterated.
          // Steps 4 and 5 may be decided independently afterward.
@@ -364,8 +478,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-09-08 10:49:08.170659672 +0100
 @@ -402,7 +402,7 @@
      private static Map<Coding, Coding> codeMap;
  
@@ -376,8 +490,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-09-08 10:49:08.174659600 +0100
 @@ -921,7 +921,7 @@
      public static
      Index[] partition(Index ix, int[] keys) {
@@ -406,8 +520,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	2015-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-09-08 10:42:12.558241960 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-09-08 10:49:08.174659600 +0100
 @@ -61,7 +61,7 @@
                  ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
  
@@ -445,8 +559,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-09-08 10:49:08.174659600 +0100
 @@ -45,7 +45,7 @@
      private final ArrayList<E> flist;
  
@@ -457,8 +571,8 @@
          for (int i = 0 ; i < capacity ; i++) {
              flist.add(null);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-06-12 23:14:47.135406443 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-09-08 10:42:12.262247378 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-09-08 10:49:08.174659600 +0100
 @@ -112,7 +112,7 @@
      public static final Attribute.Layout attrSourceFileSpecial;
      public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -614,8 +728,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	2015-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-09-08 10:42:12.558241960 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-09-08 10:49:08.174659600 +0100
 @@ -686,7 +686,7 @@
          cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
          cp_Signature_classes.readFrom(in);
@@ -729,8 +843,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	2015-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-09-08 10:42:12.562241887 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-09-08 10:49:08.174659600 +0100
 @@ -116,7 +116,7 @@
      int[][]     attrCounts;       // count attr. occurences
  
@@ -786,8 +900,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-09-08 10:49:08.174659600 +0100
 @@ -183,8 +183,8 @@
          final Map<Attribute.Layout, Attribute> attrDefs;
          final Map<Attribute.Layout, String> attrCommands;
@@ -818,8 +932,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2015-09-08 10:49:08.174659600 +0100
 @@ -309,7 +309,7 @@
          // As each new value is added, we assert that the value
          // was not already in the set.
@@ -830,8 +944,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	2015-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2015-09-08 10:42:12.562241887 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2015-09-08 10:49:08.174659600 +0100
 @@ -48,8 +48,8 @@
   */
  
@@ -862,8 +976,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	2015-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2015-07-31 14:21:55.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2015-09-08 10:49:08.174659600 +0100
 @@ -58,12 +58,12 @@
      private final Map<String, MemberEntry> memberEntries;
  
@@ -884,8 +998,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	2015-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2015-09-08 10:42:12.562241887 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2015-09-08 10:49:08.174659600 +0100


More information about the distro-pkg-dev mailing list