/hg/release/icedtea7-2.6: Bump to icedtea-2.6.10
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 12 17:03:30 UTC 2017
changeset 8dab14649af2 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=8dab14649af2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 12 17:42:28 2017 +0100
Bump to icedtea-2.6.10
Upstream changes:
- Bump to icedtea-2.6.10
- S4717864: setFont() does not update Fonts of Menus already on screen
- S6474807: (smartcardio) CardTerminal.connect() throws CardException instead of CardNotPresentException
- S6515172, PR3362: Runtime.availableProcessors() ignores Linux taskset command
- 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-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
Bump to icedtea-2.6.10.
(JDK_UPDATE_VERSION): Bump to 141.
(BUILD_VERSION): Bump to b02.
(CORBA_CHANGESET): Update to icedtea-2.6.10.
(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.6.10.
* hotspot.map.in: Update to icedtea-2.6.10.
* patches/boot/ecj-diamond.patch:
Add new 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 new case in sun.awt.SunToolkit.
diffstat:
ChangeLog | 31 +++++
Makefile.am | 30 ++--
NEWS | 81 +++++++++++++++
configure.ac | 2 +-
hotspot.map.in | 2 +-
patches/boot/ecj-diamond.patch | 169 ++++++++++++++++++++++++++++++++
patches/boot/ecj-trywithresources.patch | 21 +++
7 files changed, 319 insertions(+), 17 deletions(-)
diffs (393 lines):
diff -r 4582c7bb8d02 -r 8dab14649af2 ChangeLog
--- a/ChangeLog Thu May 04 00:47:21 2017 +0100
+++ b/ChangeLog Fri May 12 17:42:28 2017 +0100
@@ -1,3 +1,34 @@
+2017-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ Bump to icedtea-2.6.10.
+ (JDK_UPDATE_VERSION): Bump to 141.
+ (BUILD_VERSION): Bump to b02.
+ (CORBA_CHANGESET): Update to icedtea-2.6.10.
+ (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.6.10.
+ * hotspot.map.in: Update to icedtea-2.6.10.
+ * patches/boot/ecj-diamond.patch:
+ Add new 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 new case in sun.awt.SunToolkit.
+
2017-04-03 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3349: Architectures unsupported by SystemTap
diff -r 4582c7bb8d02 -r 8dab14649af2 Makefile.am
--- a/Makefile.am Thu May 04 00:47:21 2017 +0100
+++ b/Makefile.am Fri May 12 17:42:28 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 = dcdf5b845fa7
-JAXP_CHANGESET = 82f4cfac52db
-JAXWS_CHANGESET = fc563206c50c
-JDK_CHANGESET = fb3599f6b861
-LANGTOOLS_CHANGESET = fd8dde40d9dd
-OPENJDK_CHANGESET = cd7f56e17866
-
-CORBA_SHA256SUM = d185cd80b95b3f5ef15ffbc76446b3e080905348a6162f7785f89453383c45aa
-JAXP_SHA256SUM = 2a246ffc9048f4ae5f712948afcc9beb56da20989db1a136a494b1877c7666c0
-JAXWS_SHA256SUM = dc66ed948b1c3d6e3204ffda9f85c92fa5d54c2790caa39889fc81bf413b238f
-JDK_SHA256SUM = 6b9d68e9b8aad980c7b4f6b89d89ccb8564edba17a6656b9a93824fe206d3e62
-LANGTOOLS_SHA256SUM = ba9788e3cdc0f2d94bccfa3d449499adad944ab5bb67bd92a46a9f40cfbf1082
-OPENJDK_SHA256SUM = 68262aa4e7802f300588d7daf6d07ec00dd91fc5f04b1d99e1e478d259713354
+CORBA_CHANGESET = 4d807b58849e
+JAXP_CHANGESET = 4099d8cf255f
+JAXWS_CHANGESET = bc4f48c1ccba
+JDK_CHANGESET = 11e15e507828
+LANGTOOLS_CHANGESET = 6e30439005f6
+OPENJDK_CHANGESET = b3f98f0d4549
+
+CORBA_SHA256SUM = 2d173e14e89520106bec26696a520b643ae1eee4f615a05a0f44c40ca7f174ed
+JAXP_SHA256SUM = 451df1bed6179be1cfb655623bb67ed0dfd551fdeeeec029ef8db74d8ca51f69
+JAXWS_SHA256SUM = 765cb50d5afeaae0eb717b297e79472d1353d822e56cfc7e9e6845b49731cd57
+JDK_SHA256SUM = 50d0af5fd5008b6f4b07811c77c570d065584f8c1c70bafe016a6d10b6a36481
+LANGTOOLS_SHA256SUM = 02d38317e85b7c10f0cc072c192467a504cf37a2a0d94cddc4347f5c56677653
+OPENJDK_SHA256SUM = b0a9dd2e3c0b3a29d791e49c6e5ea63057380a8eb7574355d4c551986ed7740a
DROP_URL = http://icedtea.classpath.org/download/drops
diff -r 4582c7bb8d02 -r 8dab14649af2 NEWS
--- a/NEWS Thu May 04 00:47:21 2017 +0100
+++ b/NEWS Fri May 12 17:42:28 2017 +0100
@@ -14,9 +14,90 @@
New in release 2.6.10 (2017-04-XX):
+* Security fixes
+ - S8163520, CVE-2017-3509: Reuse cache entries
+ - S8163528, CVE-2017-3511: Better library loading
+ - S8165626, CVE-2017-3512: Improved window framing
+ - S8167110, CVE-2017-3514: Windows peering issue
+ - S8169011, CVE-2017-3526: Resizing XML parse trees
+ - S8170222, CVE-2017-3533: Better transfers of files
+ - S8171121, CVE-2017-3539: Enhancing jar checking
+ - S8171533, CVE-2017-3544: Better email transfer
+ - S8172299: Improve class processing
* New features
- PR3347: jstack.stp should support AArch64
+* Import of OpenJDK 7 u141 build 0
+ - 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.
+ - 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)
+ - 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
+ - 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
+ - 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
+ - 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
+ - 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
+ - S8164533: sun/security/ssl/SSLSocketImpl/CloseSocket.java failed with "Error while cleaning up threads after test"
+ - S8167179: Make XSL generated namespace prefixes local to transformation process
+ - S8169465: Deadlock in com.sun.jndi.ldap.pool.Connections
+ - S8169589: [macosx] Activating a JDialog puts to back another dialog
+ - S8170307: Stack size option -Xss is ignored
+ - S8170316: (tz) Support tzdata2016j
+ - S8170814: Reuse cache entries (part II)
+ - 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.
+ - 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)"
+ - S8175163: [bsd] Fix build after "8005629: javac warnings compiling java.awt.EventDispatchThread..."
+ - S8176044: (tz) Support tzdata2017a
+* Import of OpenJDK 7 u141 build 1
+ - S8043723: max_heap_for_compressed_oops() declared with size_t, but defined with uintx
+* Import of OpenJDK 7 u141 build 2
+ - S8011123: serialVersionUID of java.awt.dnd.InvalidDnDOperationException changed in JDK8-b82
* Backports
+ - S6515172, PR3362: Runtime.availableProcessors() ignores Linux taskset command
- S8011621, PR3209: live_ranges_in_separate_class.patch
- S8022284, PR3209: Hide internal data structure in PhaseCFG
- S8023003, PR3209: Cleanup the public interface to PhaseCFG
diff -r 4582c7bb8d02 -r 8dab14649af2 configure.ac
--- a/configure.ac Thu May 04 00:47:21 2017 +0100
+++ b/configure.ac Fri May 12 17:42:28 2017 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.10pre01], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.10], [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 4582c7bb8d02 -r 8dab14649af2 hotspot.map.in
--- a/hotspot.map.in Thu May 04 00:47:21 2017 +0100
+++ b/hotspot.map.in Fri May 12 17:42:28 2017 +0100
@@ -1,2 +1,2 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ ada095ab78a9 6d3b7b27ea0d6fa6a22089ee19f6c90997d56b957d3cd91acef1f2fe19009811
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 8edec8d2933a ab2b144695d0dfcf342b569b3f4e8450b61c073a3b7c60870fc88cb6d66bd560
diff -r 4582c7bb8d02 -r 8dab14649af2 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Thu May 04 00:47:21 2017 +0100
+++ b/patches/boot/ecj-diamond.patch Fri May 12 17:42:28 2017 +0100
@@ -10182,3 +10182,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-05-12 04:28:32.102258484 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/Cursor.java 2017-05-12 04:31:12.107684751 +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-05-12 04:28:32.114258291 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java 2017-05-12 04:30:57.179924868 +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-05-12 04:28:32.122258163 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/EventQueue.java 2017-05-12 04:30:49.316051359 +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-05-12 04:28:32.130258034 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/MenuBar.java 2017-05-12 04:30:34.568288582 +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-05-12 04:28:32.138257906 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/Menu.java 2017-05-12 04:30:06.920733299 +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-05-12 04:28:32.150257712 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/RenderingHints.java 2017-05-12 04:29:43.689106987 +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-05-12 04:28:32.166257456 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java 2017-05-12 04:29:24.093422190 +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-05-12 14:25:18.159052839 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java 2017-05-12 14:26:11.898179373 +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-05-12 14:25:18.183052448 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java 2017-05-12 14:25:46.550591354 +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();
diff -r 4582c7bb8d02 -r 8dab14649af2 patches/boot/ecj-trywithresources.patch
--- a/patches/boot/ecj-trywithresources.patch Thu May 04 00:47:21 2017 +0100
+++ b/patches/boot/ecj-trywithresources.patch Fri May 12 17:42:28 2017 +0100
@@ -1705,3 +1705,24 @@
}
}
+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-05-12 05:11:37.156626217 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java 2017-05-12 05:14:27.177890518 +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){
+ return false;
++ } finally {
++ if (is != null) {
++ try { is.close(); } catch (IOException ex) {}
++ }
+ }
+ }
+ return false;
More information about the distro-pkg-dev
mailing list