Mercurial > hg > icedtea7

changeset 2916:0e1ff6b44292 icedtea-2.7.0pre12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to icedtea-2.7.0pre12. Upstream changes: - S4717864: setFont() does not update Fonts of Menus already on screen - S6474807: (smartcardio) CardTerminal.connect() throws CardException instead of CardNotPresentException - S6518907: cleanup IA64 specific code in Hotspot - S6869327: Add new C2 flag to keep safepoints in counted loops. - S7102489: RFE: cleanup jlong typedef on __APPLE__and _LLP64 systems. - S7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM - S7124213: [macosx] pack() does ignore size of a component; doesn't on the other platforms - S7124219: [macosx] Unable to draw images to fullscreen - S7124552: [macosx] NullPointerException in getBufferStrategy() - S7148275: [macosx] setIconImages() not working correctly (distorted icon when minimized) - S7150092: NTLM authentication fail if user specified a different realm - S7154841: [macosx] Popups appear behind taskbar - S7155957: closed/java/awt/MenuBar/MenuBarStress1/MenuBarStress1.java hangs on win 64 bit with jdk8 - S7160627: [macosx] TextArea has wrong initial size - S7167293: FtpURLConnection connection leak on FileNotFoundException - S7168851: [macosx] Netbeans crashes in CImage.nativeCreateNSImageFromArray - S7197203: sun/misc/URLClassPath/ClassnameCharTest.sh failed, compile error - S8000351: Tenuring threshold should be unsigned - S8005255: [macosx] Cleanup warnings in sun.lwawt - S8006088: Incompatible heap size flags accepted by VM - S8007295: Reduce number of warnings in awt classes - S8010722: assert: failed: heap size is too big for compressed oops - S8011059: [macosx] Support automatic @2x images loading on Mac OS X - S8011123: serialVersionUID of java.awt.dnd.InvalidDnDOperationException changed in JDK8-b82 - S8014058: Regression tests for 8006088 - S8014489: tests/gc/arguments/Test(Serial|CMS|Parallel|G1)HeapSizeFlags jtreg tests invoke wrong class - S8016302: Change type of the number of GC workers to unsigned int (2) - S8024662: gc/arguments/TestUseCompressedOopsErgo.java does not compile. - S8024669: Native OOME when allocating after changes to maximum heap supporting Coops sizing on sparcv9 - S8024926: [macosx] AquaIcon HiDPI support - S8025974: l10n for policytool - S8027025: [macosx] getLocationOnScreen returns 0 if parent invisible - S8028212: Custom cursor HiDPI support - S8028471: PPC64 (part 215): opto: Extend ImplicitNullCheck optimization. - S8031573: [macosx] Checkmarks of JCheckBoxMenuItems aren't rendered in high resolution on Retina - S8033534: [macosx] Get MultiResolution image from native system - S8033786: White flashing when opening Dialogs and Menus using Nimbus with dark background - S8035568: [macosx] Cursor management unification - S8041734: JFrame in full screen mode leaves empty workspace after close - S8043723: max_heap_for_compressed_oops() declared with size_t, but defined with uintx - S8059803: Update use of GetVersionEx to get correct Windows version in hs_err files - S8066504: GetVersionEx in java.base/windows/native/libjava/java_props_md.c might not get correct Windows version 0 - S8076455: IME Composition Window is displayed on incorrect position - S8078668: jar usage string mentions unsupported option '-n' - S8079595: Resizing dialog which is JWindow parent makes JVM crash - S8080729: [macosx] java 7 and 8 JDialogs on multiscreen jump to parent frame on focus - S8130769: The new menu can't be shown on the menubar after clicking the "Add" button. - S8133357: 8u65 l10n resource file translation update - S8146602: jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java test fails with NullPointerException - S8147842: IME Composition Window is displayed at incorrect location - S8147910: Cache initial active_processor_count - S8150490: Update OS detection code to recognize Windows Server 2016 - S8161147: jvm crashes when -XX:+UseCountedLoopSafepoints is enabled - S8161195: Regression: closed/javax/swing/text/FlowView/LayoutTest.java - S8161993: G1 crashes if active_processor_count changes during startup - S8162603: Unrecognized VM option 'UseCountedLoopSafepoints' - S8162876: [TEST_BUG] sun/net/www/protocol/http/HttpInputStream.java fails intermittently - S8163520: Reuse cache entries - S8163528: Better library loading - S8164533: sun/security/ssl/SSLSocketImpl/CloseSocket.java failed with "Error while cleaning up threads after test" - S8165626: Improved window framing - S8167110: Windows peering issue - S8167179: Make XSL generated namespace prefixes local to transformation process - S8169011: Resizing XML parse trees - S8169465: Deadlock in com.sun.jndi.ldap.pool.Connections - S8169589: [macosx] Activating a JDialog puts to back another dialog - S8170222: Better transfers of files - S8170307: Stack size option -Xss is ignored - S8170316: (tz) Support tzdata2016j - S8170814: Reuse cache entries (part II) - S8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments - S8171121: Enhancing jar checking - S8171388: Update JNDI Thread contexts - S8171533: Better email transfer - S8171949: [macosx] AWT_ZoomFrame Automated tests fail with error: The bitwise mask Frame.ICONIFIED is not setwhen the frame is in ICONIFIED state - S8171952: [macosx] AWT_Modality/Automated/ModalExclusion/NoExclusion/ModelessDialog test fails as DummyButton on Dialog did not gain focus when clicked. - S8172299: Improve class processing - S8173783: IllegalArgumentException: jdk.tls.namedGroups - S8173931: 8u131 L10n resource file update - S8174844: Incorrect GPL header causes RE script to miss swap to commercial header for licensee source bundle - S8174985: NTLM authentication doesn't work with IIS if NTLM cache is disabled - S8175087: [bsd] Fix build after "8024900: PPC64: Enable new build on AIX (jdk part)" - S8175163: [bsd] Fix build after "8005629: javac warnings compiling java.awt.EventDispatchThread..." - S8176044: (tz) Support tzdata2017a ChangeLog: 2017-07-14 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump to icedtea-2.7.0pre12. * Makefile.am: (JDK_UPDATE_VERSION): Bump to 141. (BUILD_VERSION): Reset to b02. (CORBA_CHANGESET): Update to icedtea-2.7.0pre12. (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.0pre12. * hotspot.map.in: Update to icedtea-2.7.0pre12. * patches/boot/ecj-diamond.patch: Add cases in java.awt.Cursor, java.awt.datatransfer.Clipboard, java.awt.EventQueue, java.awt.MenuBar, java.awt.Menu, java.awt.RenderingHints, sun.net.www.protocol.http.NegotiateAuthentication, com.sun.jndi.ldap.pool.Connections and com.sun.jndi.ldap.pool.Pool. * patches/boot/ecj-trywithresources.patch: Add case in sun.awt.SunToolkit.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 18 Jul 2017 03:13:49 +0100
parents 9cb91fc8fbfe
children f1d865ecc241
files ChangeLog Makefile.am NEWS configure.ac hotspot.map.in patches/boot/ecj-diamond.patch patches/boot/ecj-trywithresources.patch
diffstat 7 files changed, 241 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 06 04:02:48 2017 +0100
+++ b/ChangeLog	Tue Jul 18 03:13:49 2017 +0100
@@ -1,3 +1,35 @@
+2017-07-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to icedtea-2.7.0pre12.
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Bump to 141.
+	(BUILD_VERSION): Reset to b02.
+	(CORBA_CHANGESET): Update to icedtea-2.7.0pre12.
+	(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.0pre12.
+	* hotspot.map.in: Update to icedtea-2.7.0pre12.
+	* patches/boot/ecj-diamond.patch:
+	Add cases in java.awt.Cursor,
+	java.awt.datatransfer.Clipboard,
+	java.awt.EventQueue, java.awt.MenuBar,
+	java.awt.Menu, java.awt.RenderingHints,
+	sun.net.www.protocol.http.NegotiateAuthentication,
+	com.sun.jndi.ldap.pool.Connections and
+	com.sun.jndi.ldap.pool.Pool.
+	* patches/boot/ecj-trywithresources.patch:
+	Add case in sun.awt.SunToolkit.
+
 2017-06-05  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* NEWS: Add 2.6.10 release notes.
--- a/Makefile.am	Tue Jun 06 04:02:48 2017 +0100
+++ b/Makefile.am	Tue Jul 18 03:13:49 2017 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 131
-BUILD_VERSION = b00
+JDK_UPDATE_VERSION = 141
+BUILD_VERSION = b02
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 175b0f4c2fea
-JAXP_CHANGESET = 3d21a63343ab
-JAXWS_CHANGESET = b0df9ac3c8ca
-JDK_CHANGESET = e14bbf59343d
-LANGTOOLS_CHANGESET = e5e327d32e65
-OPENJDK_CHANGESET = e7b0a2992b06
-
-CORBA_SHA256SUM = 64ac30b89f26a3950783283b23b7efb95e3d24c81475b0cea43ae3ccb537235e
-JAXP_SHA256SUM = 068feea8fde6b552fa370f3e1061a564b0eb6d0bd3e0a0e6c04357fd49757692
-JAXWS_SHA256SUM = 65100f14bdce16633def33b35d046742ab507c9cadfc1a289511011aef551fb2
-JDK_SHA256SUM = 81cb7b6b5c3485278fe6a65826fb24a707a9f6ef890c14aaa0f814638636286f
-LANGTOOLS_SHA256SUM = 7fda2d10f2214ac250cd09e2c469ac8a552155af481080fc1bd225115ebb13ee
-OPENJDK_SHA256SUM = e0bb29f39b31a08704a9409728a8948d9ac508799885a5ea4a60e406369abf45
+CORBA_CHANGESET = 3ca84ee78bd3
+JAXP_CHANGESET = b24121efd081
+JAXWS_CHANGESET = 878d12a073cb
+JDK_CHANGESET = 5af12d99fb1e
+LANGTOOLS_CHANGESET = aca9535e921d
+OPENJDK_CHANGESET = 325028fb6c2a
+
+CORBA_SHA256SUM = 598b368fc8b5c4a06c1e342fad382ef3e9d1bc73bf55910b56ef35dd64823646
+JAXP_SHA256SUM = a4f53d69a27279f64061adab340bb46567f58e5a612ef4fc46014082215b1881
+JAXWS_SHA256SUM = 67d3bd4d18fb4f35c67d103cd68836d0b8a36443f96e0ba0c76f04f5e565f5a1
+JDK_SHA256SUM = f4e399d066e843c9085c92c2da54ba5a998d70dd0de44979d5a4449725923eb4
+LANGTOOLS_SHA256SUM = 7f2b3c90391ea0360e7910f90029903098ebf7e0d52ed73d402a55024e2a9d03
+OPENJDK_SHA256SUM = dc90ec25c74d1cc847c8a98d13a95cf833a4de5cdba5f8b2707eda8c615bc1b6
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
--- a/NEWS	Tue Jun 06 04:02:48 2017 +0100
+++ b/NEWS	Tue Jul 18 03:13:49 2017 +0100
@@ -98,6 +98,7 @@
   - S8171388: Update JNDI Thread contexts
   - S8171949: [macosx] AWT_ZoomFrame Automated tests fail with error: The bitwise mask Frame.ICONIFIED is not setwhen the frame is in ICONIFIED state
   - S8171952: [macosx] AWT_Modality/Automated/ModalExclusion/NoExclusion/ModelessDialog test fails as DummyButton on Dialog did not gain focus when clicked.
+  - S8173783, PR3329: IllegalArgumentException: jdk.tls.namedGroups
   - S8173931: 8u131 L10n resource file update
   - S8174844: Incorrect GPL header causes RE script to miss swap to commercial header for licensee source bundle
   - S8175087: [bsd] Fix build after "8024900: PPC64: Enable new build on AIX (jdk part)"
@@ -116,7 +117,6 @@
   - S8023988, PR3209: Move local scheduling of nodes to the CFG creation and code motion phase (PhaseCFG)
   - S8043780, PR3369: Use open(O_CLOEXEC) instead of fcntl(FD_CLOEXEC)
   - S8157306, PR3209: Random infrequent null pointer exceptions in javac
-  - S8173783, PR3329: IllegalArgumentException: jdk.tls.namedGroups
   - S8173941, PR3330: SA does not work if executable is DSO
   - S8174729, PR3361: Race Condition in java.lang.reflect.WeakCache
 * Bug fixes
--- a/configure.ac	Tue Jun 06 04:02:48 2017 +0100
+++ b/configure.ac	Tue Jul 18 03:13:49 2017 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.7.0pre11], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.7.0pre12], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
--- a/hotspot.map.in	Tue Jun 06 04:02:48 2017 +0100
+++ b/hotspot.map.in	Tue Jul 18 03:13:49 2017 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 8d8fc0174498 55d116dc83ff41f0812377d7b1a8388392d9fb7664a754b68bb99e5982ae1ef5
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 490b222d74de 41449cbb9e5981f22d09bf24a9d4fd68c54c62e12170eff1b9908d909082cdca
--- a/patches/boot/ecj-diamond.patch	Tue Jun 06 04:02:48 2017 +0100
+++ b/patches/boot/ecj-diamond.patch	Tue Jul 18 03:13:49 2017 +0100
@@ -10428,3 +10428,172 @@
          List<Thread> threads = new ArrayList<Thread>();
          for (int i = 0; i < threadCount; i++) {
              RandomCollector r = new RandomCollector();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/Cursor.java openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/Cursor.java	2017-07-14 17:51:22.731719319 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java	2017-07-14 17:53:52.713265358 +0100
+@@ -163,7 +163,7 @@
+      * hashtable, filesystem dir prefix, filename, and properties for custom cursors support
+      */
+ 
+-    private static final Hashtable<String,Cursor> systemCustomCursors = new Hashtable<>(1);
++    private static final Hashtable<String,Cursor> systemCustomCursors = new Hashtable<String,Cursor>(1);
+     private static final String systemCustomCursorDirPrefix = initCursorDir();
+ 
+     private static String initCursorDir() {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java	2017-07-14 17:51:22.739719188 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java	2017-07-14 17:53:43.673413243 +0100
+@@ -341,7 +341,7 @@
+      * @since 1.5
+      */
+     private Set<DataFlavor> getAvailableDataFlavorSet() {
+-        Set<DataFlavor> set = new HashSet<>();
++        Set<DataFlavor> set = new HashSet<DataFlavor>();
+         Transferable contents = getContents(null);
+         if (contents != null) {
+             DataFlavor[] flavors = contents.getTransferDataFlavors();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/EventQueue.java openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/EventQueue.java	2017-07-14 17:51:22.751718992 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java	2017-07-14 17:53:17.321844353 +0100
+@@ -1183,7 +1183,7 @@
+                 return;
+             }
+ 
+-            currentEvent = new WeakReference<>(e);
++            currentEvent = new WeakReference<AWTEvent>(e);
+ 
+             // This series of 'instanceof' checks should be replaced with a
+             // polymorphic type (for example, an interface which declares a
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/MenuBar.java openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/MenuBar.java	2017-07-14 17:51:22.759718861 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java	2017-07-14 17:52:41.754426272 +0100
+@@ -94,7 +94,7 @@
+      * @serial
+      * @see #countMenus()
+      */
+-    Vector<Menu> menus = new Vector<>();
++    Vector<Menu> menus = new Vector<Menu>();
+ 
+     /**
+      * This menu is a special menu dedicated to
+@@ -323,7 +323,7 @@
+      * @since       JDK1.1
+      */
+     public synchronized Enumeration<MenuShortcut> shortcuts() {
+-        Vector<MenuShortcut> shortcuts = new Vector<>();
++        Vector<MenuShortcut> shortcuts = new Vector<MenuShortcut>();
+         int nmenus = getMenuCount();
+         for (int i = 0 ; i < nmenus ; i++) {
+             Enumeration<MenuShortcut> e = getMenu(i).shortcuts();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/Menu.java openjdk-boot/jdk/src/share/classes/java/awt/Menu.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/Menu.java	2017-07-14 17:51:22.775718599 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/Menu.java	2017-07-14 17:52:30.842604809 +0100
+@@ -78,7 +78,7 @@
+      * @serial
+      * @see #countItems()
+      */
+-    Vector<MenuComponent> items = new Vector<>();
++    Vector<MenuComponent> items = new Vector<MenuComponent>();
+ 
+     /**
+      * This field indicates whether the menu has the
+@@ -313,7 +313,7 @@
+             }
+ 
+             int nitems = getItemCount();
+-            Vector<MenuItem> tempItems = new Vector<>();
++            Vector<MenuItem> tempItems = new Vector<MenuItem>();
+ 
+             /* Remove the item at index, nitems-index times
+                storing them in a temporary vector in the
+@@ -379,7 +379,7 @@
+             }
+ 
+             int nitems = getItemCount();
+-            Vector<MenuItem> tempItems = new Vector<>();
++            Vector<MenuItem> tempItems = new Vector<MenuItem>();
+ 
+             /* Remove the item at index, nitems-index times
+                storing them in a temporary vector in the
+@@ -476,7 +476,7 @@
+     }
+ 
+     synchronized Enumeration<MenuShortcut> shortcuts() {
+-        Vector<MenuShortcut> shortcuts = new Vector<>();
++        Vector<MenuShortcut> shortcuts = new Vector<MenuShortcut>();
+         int nitems = getItemCount();
+         for (int i = 0 ; i < nitems ; i++) {
+             MenuItem mi = getItem(i);
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/RenderingHints.java openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/RenderingHints.java	2017-07-14 17:51:22.783718468 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java	2017-07-14 17:53:34.281566890 +0100
+@@ -92,7 +92,7 @@
+      * {@code equals()} method.
+      */
+     public abstract static class Key {
+-        private static HashMap<Object,Object> identitymap = new HashMap<>(17);
++        private static HashMap<Object,Object> identitymap = new HashMap<Object,Object>(17);
+ 
+         private String getIdentity() {
+             // Note that the identity string is dependent on 3 variables:
+@@ -195,7 +195,7 @@
+         }
+     }
+ 
+-    HashMap<Object,Object> hintmap = new HashMap<>(7);
++    HashMap<Object,Object> hintmap = new HashMap<Object,Object>(7);
+ 
+     /**
+      * Antialiasing hint key.
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java	2017-07-14 17:51:22.803718141 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java	2017-07-14 17:52:10.078944551 +0100
+@@ -128,7 +128,7 @@
+      */
+     private static synchronized boolean isSupportedImpl(HttpCallerInfo hci) {
+         if (supported == null) {
+-            supported = new HashMap<>();
++            supported = new HashMap<String, Boolean>();
+         }
+         String hostname = hci.host;
+         hostname = hostname.toLowerCase();
+@@ -145,7 +145,7 @@
+                 cache = new ThreadLocal<HashMap<String, Negotiator>>() {
+                     @Override
+                     protected HashMap<String, Negotiator> initialValue() {
+-                        return new HashMap<>();
++                        return new HashMap<String, Negotiator>();
+                     }
+                 };
+             }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java	2017-07-14 18:43:02.445291208 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java	2017-07-14 18:43:42.736642459 +0100
+@@ -292,9 +292,9 @@
+     boolean expire(long threshold) {
+         List<ConnectionDesc> clonedConns;
+         synchronized(this) {
+-            clonedConns = new ArrayList<>(conns);
++            clonedConns = new ArrayList<ConnectionDesc>(conns);
+         }
+-        List<ConnectionDesc> expired = new ArrayList<>();
++        List<ConnectionDesc> expired = new ArrayList<ConnectionDesc>();
+ 
+         for (ConnectionDesc entry : clonedConns) {
+             d("expire(): ", entry);
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java	2017-07-14 18:43:02.457291013 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java	2017-07-14 18:43:25.888913736 +0100
+@@ -165,10 +165,10 @@
+     public void expire(long threshold) {
+         Collection<ConnectionsRef> copy;
+         synchronized (map) {
+-            copy = new ArrayList<>(map.values());
++            copy = new ArrayList<ConnectionsRef>(map.values());
+         }
+ 
+-        ArrayList<ConnectionsRef> removed = new ArrayList<>();
++        ArrayList<ConnectionsRef> removed = new ArrayList<ConnectionsRef>();
+         Connections conns;
+         for (ConnectionsRef ref : copy) {
+             conns = ref.getConnections();
--- a/patches/boot/ecj-trywithresources.patch	Tue Jun 06 04:02:48 2017 +0100
+++ b/patches/boot/ecj-trywithresources.patch	Tue Jul 18 03:13:49 2017 +0100
@@ -1649,3 +1649,25 @@
          }
  
          public Object run() {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/awt/SunToolkit.java openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/awt/SunToolkit.java	2017-07-14 18:22:28.993307143 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java	2017-07-14 18:24:38.743201166 +0100
+@@ -899,10 +899,16 @@
+     protected static boolean imageExists(URL url) {
+         checkPermissions(url);
+         if (url != null) {
+-            try (InputStream is = url.openStream()) {
++            InputStream is = null;
++            try {
++                is = url.openStream();
+                 return true;
+-            }catch(IOException e){
++            } catch(IOException e){
+                 return false;
++            } finally {
++                if (is != null) {
++                    try { is.close(); } catch (IOException e) {}
++                }
+             }
+         }
+         return false;