/hg/icedtea7: Update to icedtea-2.6pre06.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 13 20:21:33 UTC 2014
changeset 9f91f8d8857f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=9f91f8d8857f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Aug 13 21:21:16 2014 +0100
Update to icedtea-2.6pre06.
PR1903: [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information
S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true
S7090324: gclog rotation via external tool
S7094099: DropDown List of JComboBox detached
S7121403: [TESTBUG] runtime/7051189/Xchecksig.sh fails on 64bit solaris
S7130140: using horizontal scroll button on mouse causes a message to be printed on stdout
S7153157: ClassValue.get does not return if computeValue calls remove
S7160604: Using non-opaque windows - popups are initially not painted correctly
S7164841: Improvements to the GC log file rotation
S7172865: PropertyDescriptor fails to work with setter method name if setter is non-void
S7195480: javax.smartcardio does not detect cards on Mac OS X
S8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info
S8011795: DOM Serializer prints stack traces to System.err
S8013098: [macosx] localized aqua_xx.properties are not included in rt.jar
S8022070: Compilation error in stubGenerator_sparc.cpp with some compilers
S8024061: Exception thrown when drag and drop between two components is executed quickly
S8024677: [TESTBUG] Move tests for classes in /testlibrary
S8024932: [TEST_BUG] [macosx] javax/swing/text/StyledEditorKit/8016833/bug8016833.java failed
S8025710: Proxied HTTPS connections reused by HttpClient can send CONNECT to the server
S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
S8028192: Use of PKCS11-NSS provider in FIPS mode broken
S8028617: Dvorak keyboard mapping not honored when ctrl key pressed
S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings
S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions
S8030114: [parfait] warnings from b119 for jdk.src.share.native.sun.security.smartcardio: JNI exception pending
S8031075: [Regression] focus disappears with shift+tab on dialog having one focus component
S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter
S8032874: ArrayIndexOutOfBoundsException in JTable while clearing data in JTable
S8033113: wsimport fails on WSDL:header parameter name customization
S8033571: [parfait] warning from b128 for security/smartcardio/pcsc_md.c: JNI exception pending
S8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction
S8034118: [parfait] JNI exception pending in macosx/native/sun/awt/JavaComponentAccessibility.m
S8034200: Test java/net/CookieHandler/LocalHostCookie.java fails after fix of JDK-7169142
S8034768: [parfait] JNI exception pending in jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
S8036819: JAB: mneumonics not read for textboxes
S8036861: Application can't be loaded fine,the save dialog can't show up.
S8036983: JAB:Multiselection Ctrl+CursorUp/Down and ActivateDescenderPropertyChanged event
S8037477: Reproducible hang of JAWS and webstart application with JAB 2.0.4
S8037945: Paths.get("").normalize() throws ArrayIndexOutOfBoundsException
S8038000: java.awt.image.RasterFormatException: Incorrect scanline stride
S8038306: (tz) Support tzdata2014b
S8038440: backport few C2 fixes
S8038925: Java with G1 crashes in dump_instance_fields using jmap or jcmd without fullgc
S8038961: kinit, klist and ktab aren't built from jdk7u51 in licensee src bundles
S8039042: G1: Phantom zeros in cardtable
S8039050: Crash in C2 compiler at Node::rematerialize
S8039097: Some tests fail with NPE since 7u60 b12
S8039118: Windows build failure (j2pcsc.dll : fatal error unresolved external symbol throwByName)
S8039292: new hotspot build - hs24.80-b07
S8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR))
S8039319: (smartcardio) Card.transmitControlCommand() does not work on Mac OS X
S8039368: Remove testcase from npt utf.c
S8039396: NPE when writing a class descriptor object to a custom ObjectOutputStream
S8039891: Remove ppcsflt builds from JPRT
S8039899: Missing licence headers in test for JDK-8033113
S8040664: Revert temporary fix JDK-8038785
S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh fails to cleanup files after it
S8041351: Crash in src/share/vm/opto/loopnode.cpp:3215 - assert(! had_error) failed: bad dominance
S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request
S8041507: Java Access Bridge version strings need to be fixed
S8041725: Nimbus JList selection colors persist across L&F changes
S8041931: test/sun/net/www/http/HttpClient/B8025710.java fails with cannot find keystore
S8042059: Various fixes to linux/sparc
S8042247: Make 7u60 the default jprt release for hs24.80
S8042250: Misleading command line output for ReservedCodeCacheSize validation
S8042857: 14 stuck threads waiting for notification on LDAPRequest
S8043012: (tz) Support tzdata2014c
S8043205: Incorrect system traps.h include path
S8043207: Add const to Address argument for Assembler::swap
S8043210: Add _BIG_ENDIAN define on linux/sparc
S8043507: javax.smartcardio.CardTerminals.list() fails on MacOSX
S8043720: (smartcardio) Native memory should be handled more accurately
S8050942: PPC64: implement template interpreter for ppc64le
S8050972: Concurrency problem in PcDesc cache
Adapt AIX port to 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
Adapt aix to 8022507
Fix aix after 8022507: SIGSEGV at ParMarkBitMap::verify_clear()
2014-08-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am,
(JDK_UPDATE_VERSION): Set to 80.
(BUILD_VERSION): Set to b01.
(CORBA_CHANGESET): Update to icedtea-2.6pre06.
(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.6pre06.
* hotspot.map: Update to icedtea-2.6pre06.
* patches/boot/ecj-diamond.patch: Add new
case introduced in java.beans.MethodRef.
* patches/boot/ecj-multicatch.patch:
Regenerated.
diffstat:
ChangeLog | 25 ++
Makefile.am | 28 +-
NEWS | 75 ++++++++-
configure.ac | 2 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 21 ++
patches/boot/ecj-multicatch.patch | 342 +++++++++++++++++--------------------
7 files changed, 296 insertions(+), 199 deletions(-)
diffs (truncated from 737 to 500 lines):
diff -r 4853e7794646 -r 9f91f8d8857f ChangeLog
--- a/ChangeLog Wed Aug 06 16:24:38 2014 +0100
+++ b/ChangeLog Wed Aug 13 21:21:16 2014 +0100
@@ -1,3 +1,28 @@
+2014-08-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am,
+ (JDK_UPDATE_VERSION): Set to 80.
+ (BUILD_VERSION): Set to b01.
+ (CORBA_CHANGESET): Update to icedtea-2.6pre06.
+ (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.6pre06.
+ * hotspot.map: Update to icedtea-2.6pre06.
+ * patches/boot/ecj-diamond.patch: Add new
+ case introduced in java.beans.MethodRef.
+ * patches/boot/ecj-multicatch.patch:
+ Regenerated.
+
2014-07-16 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1867: Turn the infinality patch off by default
diff -r 4853e7794646 -r 9f91f8d8857f Makefile.am
--- a/Makefile.am Wed Aug 06 16:24:38 2014 +0100
+++ b/Makefile.am Wed Aug 13 21:21:16 2014 +0100
@@ -1,22 +1,22 @@
# Dependencies
-JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b15
+JDK_UPDATE_VERSION = 80
+BUILD_VERSION = b01
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 90a4103857ca
-JAXP_CHANGESET = b9104a740dcd
-JAXWS_CHANGESET = 5515daa64796
-JDK_CHANGESET = 605610f355ce
-LANGTOOLS_CHANGESET = 5f917c4b87a9
-OPENJDK_CHANGESET = 7c68cd217516
+CORBA_CHANGESET = 250d1a2def5b
+JAXP_CHANGESET = 75513ef5e265
+JAXWS_CHANGESET = 37d1831108b5
+JDK_CHANGESET = 21eee0ed9be9
+LANGTOOLS_CHANGESET = f43a81252f82
+OPENJDK_CHANGESET = b07e2aed0a26
-CORBA_SHA256SUM = 43ada95a15b643ec35deac4526c3085b4ec49ac774e7fd23ecd30e22f7213ec0
-JAXP_SHA256SUM = a8d2baafe13c408b6f53c643dfde5f217a2de6911d798e8d80a3d9a8eeea0258
-JAXWS_SHA256SUM = 65c428d801172477a3fd7bf9383aa8d42074fc78eaf138a78c4f631aca1f1275
-JDK_SHA256SUM = f7f8c472b8950862d3ab2b663eec17a87959c9c8fcce6d46c32c3665323f790b
-LANGTOOLS_SHA256SUM = 98d1434fc8459eafab81e645e53dd45dafbbdbb0e8276a0f545b5f14b2178e2c
-OPENJDK_SHA256SUM = 593ec9147ba4c8165fbe602703765f925938de805dcdd6b5fe841e441817d20d
+CORBA_SHA256SUM = f2ed859b08a092db05bffb86605849644d21c951204b4db0e813e0203360d558
+JAXP_SHA256SUM = 39491a205465326b1d2f6d74ee14c79191b2acd475916617a290725c9b7d4df7
+JAXWS_SHA256SUM = 4288b5140ed7f6f368be5897ccea56ee5a63e07d57833f8bac4206af87d11afd
+JDK_SHA256SUM = 45dede8c62e8768df2d8141043610a5a5a9afea974252ad87b77676ab179c561
+LANGTOOLS_SHA256SUM = f9678c341aa7f0c6d248502c9f7746ba3abbd2c01fa542751f4e70fee5eb9131
+OPENJDK_SHA256SUM = 7583c81af29e727d6234fcf5760e88c71f07c51288ab4d9afd22461fcef832d0
DROP_URL = http://icedtea.classpath.org/download/drops
diff -r 4853e7794646 -r 9f91f8d8857f NEWS
--- a/NEWS Wed Aug 06 16:24:38 2014 +0100
+++ b/NEWS Wed Aug 13 21:21:16 2014 +0100
@@ -17,32 +17,56 @@
* OpenJDK
- S5036554: unmarshal error on CORBA alias type in CORBA any
- S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
+ - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true
- S7052170: javadoc -charset option generates wrong meta tag
- S7076487: (sctp) SCTP API classes does not exist in JDK for Mac
- S7084032: test/java/net/Inet6Address/B6558853.java fails on Windows XP/2003 if IPv6
+ - S7090324: gclog rotation via external tool
+ - S7094099: DropDown List of JComboBox detached
+ - S7121403: [TESTBUG] runtime/7051189/Xchecksig.sh fails on 64bit solaris
- S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations
+ - S7130140: using horizontal scroll button on mouse causes a message to be printed on stdout
- S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running
- S7152892: some jtreg tests fail with permission denied
+ - S7153157: ClassValue.get does not return if computeValue calls remove
+ - S7160604: Using non-opaque windows - popups are initially not painted correctly
- S7161320: TEST_BUG: java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java fails (Invalid key code)
+ - S7164841: Improvements to the GC log file rotation
- S7169142: CookieHandler does not work with localhost
+ - S7172865: PropertyDescriptor fails to work with setter method name if setter is non-void
+ - S7195480: javax.smartcardio does not detect cards on Mac OS X
- S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx]
- S8002148: [TEST_BUG] The four lines printed are not the bold typeface.
- S8006023: Embedded Builds fail management test because of requirement for UsePerfData being enabled.
+ - S8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info
+ - S8011795: DOM Serializer prints stack traces to System.err
- S8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS
+ - S8013098: [macosx] localized aqua_xx.properties are not included in rt.jar
- S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE
- S8019623: Lack of synchronization in AppContext.getAppContext()
- S8019800: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8017011
- S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address
+ - S8022070: Compilation error in stubGenerator_sparc.cpp with some compilers
- S8022531: [TEST_BUG] After double-click on the folder names , there is no 'OK' button in the dialog.
- S8022836: JVM crashes in JVMTIENVBASE::GET_CURRENT_CONTENDED_MONITOR and GET_OWNED_MONITOR
+ - S8024061: Exception thrown when drag and drop between two components is executed quickly
- S8024675: java/net/NetworkInterface/UniqueMacAddressesTest.java fails on Windows
+ - S8024677: [TESTBUG] Move tests for classes in /testlibrary
+ - S8024932: [TEST_BUG] [macosx] javax/swing/text/StyledEditorKit/8016833/bug8016833.java failed
+ - S8025710: Proxied HTTPS connections reused by HttpClient can send CONNECT to the server
+ - S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
- S8027026: Change keytool -genkeypair to use -keyalg RSA
- S8027348: (process) Enhancement of handling async close of ProcessInputStream
- S8027359: XML parser returns incorrect parsing results
- S8028073: race condition in ObjectMonitor implementation causing deadlocks
+ - S8028192: Use of PKCS11-NSS provider in FIPS mode broken
- S8028616: Htmleditorkit parser doesn't handle leading slash (/)
+ - S8028617: Dvorak keyboard mapping not honored when ctrl key pressed
- S8028623: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters.
+ - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings
+ - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions
- S8029073: (corba) New connection reclaimed when number of connection is greater than highwatermark
+ - S8030114: [parfait] warnings from b119 for jdk.src.share.native.sun.security.smartcardio: JNI exception pending
- S8030698: Several GUI labels in jconsole need correction
- S8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning
- S8030878: JConsole issues meaningless message if SSL connection fails
@@ -53,27 +77,76 @@
- S8032078: [macosx] CPlatformWindow.setWindowState throws RuntimeException, if windowState=ICONIFIED|MAXIMIZED_BOTH
- S8032466: serviceability/sa/jmap-hashcode/Test8028623.java fails with compilation errors
- S8032669: Mouse release not being delivered to Swing component in 7u45
+ - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter
- S8032832: Applet/browser deadlocks, when IIS integrated authentication is used
- S8032872: [macosx] Cannot select from JComboBox in a JWindow
+ - S8032874: ArrayIndexOutOfBoundsException in JTable while clearing data in JTable
- S8032878: Editable combos in table do not behave as expected
- S8032909: XSLT string-length returns incorrect length when string includes complementary chars
+ - S8033113: wsimport fails on WSDL:header parameter name customization
- S8033524: Set minor version for hotspot in 7u80 to 80 and build number to b01
+ - S8033571: [parfait] warning from b128 for security/smartcardio/pcsc_md.c: JNI exception pending
+ - S8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction
- S8033970: new hotspot build - hs24.80-b02
+ - S8034118: [parfait] JNI exception pending in macosx/native/sun/awt/JavaComponentAccessibility.m
+ - S8034200: Test java/net/CookieHandler/LocalHostCookie.java fails after fix of JDK-7169142
- S8034262: Test java/lang/ProcessBuilder/CloseRace.java fails
+ - S8034768: [parfait] JNI exception pending in jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
- S8034920: new hotspot build - hs24.80-b03
- S8035435: new hotspot build - hs24.80-b04
- S8035973: NPE in ForwardBuilder
- S8035988: 7u60 l10n resource file translation update 1
- S8036022: D3D: rendering with XOR composite causes InternalError.
- S8036778: new hotspot build - hs24.80-b05
+ - S8036819: JAB: mneumonics not read for textboxes
- S8036863: Update jdk7 testlibrary to match jdk8 in hotspot
+ - S8036983: JAB:Multiselection Ctrl+CursorUp/Down and ActivateDescenderPropertyChanged event
+ - S8037477: Reproducible hang of JAWS and webstart application with JAB 2.0.4
+ - S8037945: Paths.get("").normalize() throws ArrayIndexOutOfBoundsException
+ - S8038000: java.awt.image.RasterFormatException: Incorrect scanline stride
+ - S8038440: backport few C2 fixes
- S8038481: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
- S8038640: new hotspot build - hs24.80-b06
- S8038785: hot workaround fix for a crash in C2 compiler at Node::rematerialize
+ - S8038925: Java with G1 crashes in dump_instance_fields using jmap or jcmd without fullgc
+ - S8038961: kinit, klist and ktab aren't built from jdk7u51 in licensee src bundles
+ - S8039042: G1: Phantom zeros in cardtable
+ - S8039050: Crash in C2 compiler at Node::rematerialize
+ - S8039118: Windows build failure (j2pcsc.dll : fatal error unresolved external symbol throwByName)
+ - S8039292: new hotspot build - hs24.80-b07
+ - S8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR))
+ - S8039319: (smartcardio) Card.transmitControlCommand() does not work on Mac OS X
+ - S8039368: Remove testcase from npt utf.c
+ - S8039396: NPE when writing a class descriptor object to a custom ObjectOutputStream
+ - S8039891: Remove ppcsflt builds from JPRT
+ - S8039899: Missing licence headers in test for JDK-8033113
+ - S8040664: Revert temporary fix JDK-8038785
+ - S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh fails to cleanup files after it
+ - S8041351: Crash in src/share/vm/opto/loopnode.cpp:3215 - assert(! had_error) failed: bad dominance
+ - S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request
+ - S8041507: Java Access Bridge version strings need to be fixed
+ - S8041725: Nimbus JList selection colors persist across L&F changes
+ - S8041931: test/sun/net/www/http/HttpClient/B8025710.java fails with cannot find keystore
+ - S8042059: Various fixes to linux/sparc
+ - S8042247: Make 7u60 the default jprt release for hs24.80
+ - S8042250: Misleading command line output for ReservedCodeCacheSize validation
+ - S8042857: 14 stuck threads waiting for notification on LDAPRequest
+ - S8043205: Incorrect system traps.h include path
+ - S8043207: Add const to Address argument for Assembler::swap
+ - S8043210: Add _BIG_ENDIAN define on linux/sparc
+ - S8043507: javax.smartcardio.CardTerminals.list() fails on MacOSX
+ - S8043720: (smartcardio) Native memory should be handled more accurately
* Bug fixes
- PR1786: Allow x86 build to occur on x86_64 using a previously built x86_64 build
+ - PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
- PR1847: Synchronise javac.in with IcedTea6
- - PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
+ - PR1903: [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information
+* PPC & AIX port
+ - Adapt AIX port to 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
+ - Adapt aix to 8022507
+ - Fix aix after 8022507: SIGSEGV at ParMarkBitMap::verify_clear()
+ - S8050942: PPC64: implement template interpreter for ppc64le
+ - S8050972: Concurrency problem in PcDesc cache
New in release 2.4.8 (2014-07-23):
diff -r 4853e7794646 -r 9f91f8d8857f configure.ac
--- a/configure.ac Wed Aug 06 16:24:38 2014 +0100
+++ b/configure.ac Wed Aug 13 21:21:16 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6pre05], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6pre06], [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 4853e7794646 -r 9f91f8d8857f hotspot.map
--- a/hotspot.map Wed Aug 06 16:24:38 2014 +0100
+++ b/hotspot.map Wed Aug 13 21:21:16 2014 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7 fae3b09fe959 98aecf9383fa9082782771305689b272bc8d02ca0e19a75fcc293d0b10c3e210
+default drop http://icedtea.classpath.org/download/drops/icedtea7 b517477362d1 9c8fc60f6c697d4799b74aef01fb17d59c1773ce2895c710030d0201560857aa
aarch64 hg http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
diff -r 4853e7794646 -r 9f91f8d8857f patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Aug 06 16:24:38 2014 +0100
+++ b/patches/boot/ecj-diamond.patch Wed Aug 13 21:21:16 2014 +0100
@@ -7193,3 +7193,24 @@
try {
while (itr.hasNext()) {
try {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2014-08-13 18:32:51.997691114 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2014-08-13 18:33:16.046036326 +0100
+@@ -44,7 +44,7 @@
+ }
+ else {
+ this.signature = method.toGenericString();
+- this.methodRef = new SoftReference<>(method);
++ this.methodRef = new SoftReference<Method>(method);
+ this.typeRef = new WeakReference<Class<?>>(method.getDeclaringClass());
+ }
+ }
+@@ -66,7 +66,7 @@
+ this.typeRef = null;
+ }
+ else {
+- this.methodRef = new SoftReference<>(method);
++ this.methodRef = new SoftReference<Method>(method);
+ }
+ }
+ return isPackageAccessible(method.getDeclaringClass()) ? method : null;
diff -r 4853e7794646 -r 9f91f8d8857f patches/boot/ecj-multicatch.patch
--- a/patches/boot/ecj-multicatch.patch Wed Aug 06 16:24:38 2014 +0100
+++ b/patches/boot/ecj-multicatch.patch Wed Aug 13 21:21:16 2014 +0100
@@ -1,6 +1,38 @@
+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 2014-08-11 15:05:26.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-08-13 18:15:43.782916067 +0100
+@@ -145,7 +145,9 @@
+ final String name = c.name();
+ ei = new EncodingInfo(name, name);
+ _encodingInfos.putEncoding(normalizedEncoding, ei);
+- } catch (IllegalCharsetNameException | UnsupportedCharsetException x) {
++ } catch (IllegalCharsetNameException x) {
++ ei = new EncodingInfo(null,null);
++ } catch (UnsupportedCharsetException x) {
+ ei = new EncodingInfo(null,null);
+ }
+ }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2014-08-13 18:15:43.782916067 +0100
+@@ -402,7 +402,13 @@
+ try {
+ ServerNotifForwarder.checkMBeanPermission(this.mBeanServer,
+ candidate.getObjectName(),"addNotificationListener");
+- } catch (InstanceNotFoundException | SecurityException e) {
++ } catch (InstanceNotFoundException e) {
++ if (logger.debugOn()) {
++ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
++ }
++ ++nextSeq;
++ continue;
++ } catch (SecurityException e) {
+ if (logger.debugOn()) {
+ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
+ }
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/PrintStream.java openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintStream.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java 2013-04-04 13:42:21.263677653 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintStream.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java 2014-08-13 18:15:43.774915952 +0100
@@ -91,7 +91,10 @@
requireNonNull(csn, "charsetName");
try {
@@ -14,8 +46,8 @@
throw new UnsupportedEncodingException(csn);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/PrintWriter.java openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintWriter.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java 2013-04-04 13:42:21.275677843 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintWriter.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java 2014-08-13 18:15:43.778916009 +0100
@@ -85,7 +85,10 @@
Objects.requireNonNull(csn, "charsetName");
try {
@@ -29,9 +61,9 @@
throw new UnsupportedEncodingException(csn);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-04-04 13:42:21.315678473 +0100
-@@ -747,7 +747,9 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-08-13 18:15:43.778916009 +0100
+@@ -748,7 +748,9 @@
Class<?> fieldType = Wrapper.forBasicType(types.charAt(index)).primitiveType();
try {
return LOOKUP.findGetter(cbmhClass, fieldName, fieldType);
@@ -42,7 +74,7 @@
throw newInternalError(e);
}
}
-@@ -801,7 +803,13 @@
+@@ -802,7 +804,13 @@
static MethodHandle makeCbmhCtor(Class<? extends BoundMethodHandle> cbmh, String types) {
try {
return linkConstructor(LOOKUP.findConstructor(cbmh, MethodType.fromMethodDescriptorString(makeSignature(types, true), null)));
@@ -58,8 +90,8 @@
}
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2013-04-04 13:42:21.323678600 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-08-13 18:15:43.778916009 +0100
@@ -456,9 +456,11 @@
traceInterpreter("compileToBytecode", this);
isCompiled = true;
@@ -89,9 +121,9 @@
Name n = new Name(zcon).newIndex(0);
assert(n.type == ALL_TYPES.charAt(tn));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-04 13:34:02.223748460 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-04 13:42:21.323678600 +0100
-@@ -263,7 +263,12 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2014-08-13 18:10:49.482671875 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2014-08-13 18:15:43.778916009 +0100
+@@ -264,7 +264,12 @@
continue;
}
throw new InternalError(err);
@@ -106,8 +138,8 @@
// ignore exotic ops the JVM cares about; we just wont issue them
//System.err.println("warning: "+err);
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-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-04-04 13:42:21.279677906 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-08-13 18:15:43.778916009 +0100
@@ -606,7 +606,9 @@
// create an MXBean proxy
return JMX.newMXBeanProxy(connection, objName, mxbeanInterface,
@@ -119,9 +151,71 @@
throw new IllegalArgumentException(e);
}
}
+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 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-08-13 18:15:43.782916067 +0100
+@@ -1024,10 +1024,10 @@
+ dir,
+ redirects,
+ redirectErrorStream);
+- } catch (IOException | IllegalArgumentException e) {
++ } catch (IOException e) {
+ String exceptionInfo = ": " + e.getMessage();
+ Throwable cause = e;
+- if ((e instanceof IOException) && security != null) {
++ if (security != null) {
+ // Can not disclose the fail reason for read-protected files.
+ try {
+ security.checkRead(prog);
+@@ -1039,6 +1039,16 @@
+ // It's much easier for us to create a high-quality error
+ // message than the low-level C code which found the problem.
+ throw new IOException(
++ "Cannot run program \"" + prog + "\""
++ + (dir == null ? "" : " (in directory \"" + dir + "\")")
++ + exceptionInfo,
++ cause);
++ } catch (IllegalArgumentException e) {
++ String exceptionInfo = ": " + e.getMessage();
++ Throwable cause = e;
++ // It's much easier for us to create a high-quality error
++ // message than the low-level C code which found the problem.
++ throw new IOException(
+ "Cannot run program \"" + prog + "\""
+ + (dir == null ? "" : " (in directory \"" + dir + "\")")
+ + exceptionInfo,
+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 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-08-13 18:15:43.782916067 +0100
+@@ -760,7 +760,9 @@
+ private static Object newInstance(Constructor<?> cons, InvocationHandler h) {
+ try {
+ return cons.newInstance(new Object[] {h} );
+- } catch (IllegalAccessException | InstantiationException e) {
++ } catch (IllegalAccessException e) {
++ throw new InternalError(e.toString());
++ } catch (InstantiationException e) {
+ throw new InternalError(e.toString());
+ } catch (InvocationTargetException e) {
+ Throwable t = e.getCause();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/charset/Charset.java openjdk-boot/jdk/src/share/classes/java/nio/charset/Charset.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/charset/Charset.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/nio/charset/Charset.java 2014-08-13 18:15:43.782916067 +0100
+@@ -440,8 +440,9 @@
+ } catch (ClassNotFoundException x) {
+ // Extended charsets not available
+ // (charsets.jar not present)
+- } catch (InstantiationException |
+- IllegalAccessException x) {
++ } catch (InstantiationException x) {
++ throw new Error(x);
++ } catch (IllegalAccessException x) {
+ throw new Error(x);
+ }
+ return null;
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-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2013-04-04 13:42:21.283677969 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2014-08-13 18:15:43.778916009 +0100
@@ -1857,7 +1857,10 @@
Objects.requireNonNull(csn, "charsetName");
try {
@@ -135,8 +229,8 @@
throw new UnsupportedEncodingException(csn);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Scanner.java openjdk-boot/jdk/src/share/classes/java/util/Scanner.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Scanner.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Scanner.java 2013-04-04 13:42:21.299678221 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Scanner.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Scanner.java 2014-08-13 18:15:43.778916009 +0100
@@ -633,7 +633,10 @@
Objects.requireNonNull(csn, "charsetName");
try {
@@ -161,8 +255,8 @@
}
}
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-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-04-04 13:42:21.303678284 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-08-13 18:15:43.778916009 +0100
@@ -482,7 +482,9 @@
FILL_NEW_TYPED_ARRAY = IMPL_LOOKUP
.findStatic(THIS_CLASS, "fillNewTypedArray",
@@ -175,8 +269,8 @@
}
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-04-04 13:42:21.327678663 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-08-13 18:15:43.778916009 +0100
@@ -296,7 +296,16 @@
active.put(id, entry);
return entry.mobj;
@@ -196,9 +290,9 @@
* or code recompiled and user forgot to provide
* activatable constructor?
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-04-04 13:42:21.327678663 +0100
-@@ -261,11 +261,14 @@
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-08-13 18:15:43.778916009 +0100
+@@ -262,11 +262,14 @@
annotation = urlsToPath(urls);
}
@@ -215,8 +309,8 @@
* to be thrown by openConnection() and getPermission(). If it
* does happen, forget about this class loader's URLs and
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2013-04-04 13:42:21.331678726 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-08-13 15:49:21.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-08-13 18:15:43.778916009 +0100
@@ -208,7 +208,9 @@
return initialSocket;
@@ -240,8 +334,8 @@
} catch (SocketException e) {
More information about the distro-pkg-dev
mailing list