/hg/icedtea7: Update to u60 b02.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 26 15:18:05 PST 2013
changeset 2ecadf456797 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2ecadf456797
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Dec 26 23:17:45 2013 +0000
Update to u60 b02.
2013-12-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(BUILD_VERSION): Bump to b02.
(CORBA_CHANGESET): Update to current HEAD.
(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: Add changes brought in and fix
formatting.
* hotspot.map: Sync with forest HEAD.
* patches/boot/break-processbuilder-dependency.patch:
Regenerated.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new cases in com.sun.beans.util.Cache
and java.lang.reflect.WeakCache. Drop ThreadGroupContext
changes as no longer needed.
* patches/boot/ecj-multicatch.patch:
Add new case in java.nio.charset.Charset.
* patches/boot/ecj-stringswitch.patch:
Update MethodHandleNatives change to include getDeclaringClass
and getInvocationHandler.
diffstat:
ChangeLog | 31 +
Makefile.am | 26 +-
NEWS | 106 +-
hotspot.map | 2 +-
patches/boot/break-processbuilder-dependency.patch | 48 +-
patches/boot/ecj-diamond.patch | 1300 ++++++++++---------
patches/boot/ecj-multicatch.patch | 15 +
patches/boot/ecj-stringswitch.patch | 38 +-
8 files changed, 899 insertions(+), 667 deletions(-)
diffs (truncated from 3729 to 500 lines):
diff -r 92450bf34748 -r 2ecadf456797 ChangeLog
--- a/ChangeLog Fri Dec 20 11:29:32 2013 +0100
+++ b/ChangeLog Thu Dec 26 23:17:45 2013 +0000
@@ -1,3 +1,34 @@
+2013-12-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (BUILD_VERSION): Bump to b02.
+ (CORBA_CHANGESET): Update to current HEAD.
+ (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: Add changes brought in and fix
+ formatting.
+ * hotspot.map: Sync with forest HEAD.
+ * patches/boot/break-processbuilder-dependency.patch:
+ Regenerated.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add new cases in com.sun.beans.util.Cache
+ and java.lang.reflect.WeakCache. Drop ThreadGroupContext
+ changes as no longer needed.
+ * patches/boot/ecj-multicatch.patch:
+ Add new case in java.nio.charset.Charset.
+ * patches/boot/ecj-stringswitch.patch:
+ Update MethodHandleNatives change to include getDeclaringClass
+ and getInvocationHandler.
+
2013-12-20 Xerxes RÃ¥nby <xerxes at zafena.se>
Robert Lougher <rob at jamvm.org.uk>
diff -r 92450bf34748 -r 2ecadf456797 Makefile.am
--- a/Makefile.am Fri Dec 20 11:29:32 2013 +0100
+++ b/Makefile.am Thu Dec 26 23:17:45 2013 +0000
@@ -1,22 +1,22 @@
# Dependencies
JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b00
+BUILD_VERSION = b02
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = e5da8ecaf6f9
-JAXP_CHANGESET = fc76c585e6c5
-JAXWS_CHANGESET = b28455339003
-JDK_CHANGESET = 0ff397456868
-LANGTOOLS_CHANGESET = db375fd08fa3
-OPENJDK_CHANGESET = 51c1d39f82ae
+CORBA_CHANGESET = 5ec8983b8223
+JAXP_CHANGESET = 2d65c7260575
+JAXWS_CHANGESET = bd85f1c0b8a1
+JDK_CHANGESET = 4c27cda21c4a
+LANGTOOLS_CHANGESET = c271c79d6a8c
+OPENJDK_CHANGESET = 77e89f3f9031
-CORBA_SHA256SUM = d8c4e9792352a40011e8bc4bd302d94cbd12cf63d50d4edb3396724474d5c0d5
-JAXP_SHA256SUM = 35210f1d5cd741504310dbd5eb848735a8bd66157d3d9c5caa507c8fc65fcf3c
-JAXWS_SHA256SUM = d7e47d15ae3d7a9db53e72ad597ea52d2c76a8c49827b36c789424177c727c25
-JDK_SHA256SUM = b95568aa9665865b7c74a0a42bb7531b3808d7b6ae4347501c190cc76373b3c9
-LANGTOOLS_SHA256SUM = cf5962e23bf093ccfd9318e07d9fe19ce0da6026af740229f6ec90900f27073e
-OPENJDK_SHA256SUM = 785d4ad0a1dddd831c5fc315949dc9602e482bb2265a4dd6704ec3766237bed6
+CORBA_SHA256SUM = 6c9a83e473ec409a59da9c04a578f7d0ad3322e5a938216eaa0e8d8d930eceb0
+JAXP_SHA256SUM = a8577172a84a44d108f036872adb18f2c06fdc59ae401161c9159f391ef9734a
+JAXWS_SHA256SUM = b80f3c5319f2ff11bc8548c13711ffaf93de30ea5ca98468663e70fc7fbdd708
+JDK_SHA256SUM = b2c45af6da2815f85b80699e51de748924709d295e5b0d951a47bb94a4c808cd
+LANGTOOLS_SHA256SUM = dccb8f490338b3d0808cb647acea48c60839145d61bd7cca6bc1fce42eba86ed
+OPENJDK_SHA256SUM = 495d501b3f5769000bac4ca732b9a772c95a3ad0c3a390926d02302579351dc7
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
diff -r 92450bf34748 -r 2ecadf456797 NEWS
--- a/NEWS Fri Dec 20 11:29:32 2013 +0100
+++ b/NEWS Thu Dec 26 23:17:45 2013 +0000
@@ -14,18 +14,114 @@
New in release 2.5.0 (2013-XX-XX):
+* OpenJDK
+ - S5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
+ - S6889597: TEST_BUG: javax/management/remote/mandatory/URLTest.java test should be updated in jdk7 Workspace
+ - S6900441: PlatformEvent.park(millis) on Linux could still be affected by changes to the time-of-day clock
+ - S6989981: jstack causes "fatal error: ExceptionMark destructor expects no pending exceptions"
+ - S7123493: (proxy) Proxy.getProxyClass doesn't scale under high load
+ - S7124232: [TEST_BUG] [macosx] JSplitPane has wrong divider location
+ - S7124314: [TEST_BUG] [macosx] Aqua LAF: JTree doesn't select element by keyboards left and right keys
+ - S7124320: [TEST_BUG] [macosx] JComboBox doesn't change selection on mouse over
+ - S7124338: [macosx] Selection lost if a selected item removed from a java.awt.List
+ - S7129133: [macosx] Accelerators are displayed as Meta instead of the Command symbol
+ - S7133122: SA throws sun.jvm.hotspot.debugger.UnmappedAddressException when it should not
+ - S7133146: [macosx] closed/javax/swing/JInternalFrame/4193219/IconCoord fails on MacOS
+ - S7133154: [TEST_BUG] [macosx] closed/javax/swing/JInternalFrame/4251301/bug4251301.java fails on MacOS
+ - S7147084: (process) appA hangs when read output stream of appB which starts appC that runs forever
+ - S7171591: getDefaultScopeID() in src/solaris/native/java/net/net_util_md.c should return a value
+ - S7173464: Clipboard.getAvailableDataFlavors: Comparison method violates contract
+ - S7197210: java/lang/invoke/CallSiteTest.java failing on armsflt.
+ - S8003262: reverse translation required changes in xalan resource bundles
+ - S8004032: [TEST_BUG] [macosx] There is no effect when double clicking on the Icon, after right clicking on the Icon and the Icon disappear
+ - S8004051: assert(_oprs_len[mode] < maxNumberOfOperands) failed: array overflow
+ - S8004476: XSLT Extension Functions Don't Work in WebStart
+ - S8006395: Race in async socket close on Linux
+ - S8007454: (process) SetHandleInformation parameters DWORD (not BOOLEAN)
+ - S8008118: (process) Possible null pointer dereference in jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+ - S8008733: Psr:perf:osb performance regression (18%) in wss_bodyenc
+ - S8009213: sun/management/jdp/JdpTest.sh fails with exit code 1
+ - S8012326: Deadlock occurs when Charset.availableCharsets() is called by several threads at the same time
+ - S8012615: Realm.getRealmsList returns realms list in wrong
+ - S8012925: [parfait] Missing return value in jdk/src/macosx/native/sun/awt/AWTEvent.m
+ - S8015092: SchemaFactory cannot parse schema if whitespace added within patterns in Selector XPath expression
+ - S8015243: SchemaFactory does not catch enum. value that is not in the value space of the base type, anyURI
+ - S8015599: [TEST_BUG] [macosx] Test closed/javax/swing/Popup/TaskbarPositionTest.java fails since JDK 8 b75 on MacOSX
+ - S8015600: [TEST_BUG] [macosx] Test closed/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java fails since JDK 8 b75 on MacOSX
+ - S8016018: Typo in AbstractStringBuilder#indexOf and #lastIndexOf descriptions
+ - S8016271: wsimport -clientjar does not create portable jars on Windows due to hardcoded backslash
+ - S8016500: Unlocalized warnings.
+ - S8017180: [macosx] [TEST_BUG] alt-key doesn't work on macos for menu
+ - S8017195: Introduce option to setKeepAlive parameter on CORBA sockets
+ - S8019396: SA-JDI: OSThread class initialization throws an exception
+ - S8021257: com.sun.corba.se.** should be on restricted package list
+ - S8021898: Broken JIT compiler optimization for loop unswitching
+ - S8021943: FileDialog getFile returns corrupted string after previous setFile
+ - S8022507: SIGSEGV at ParMarkBitMap::verify_clear()
+ - S8022584: Memory leak in some NetworkInterface methods
+ - S8022585: VM crashes when ran with -XX:+PrintInlining
+ - S8022993: Convert MAX_UNROLL constant to LoopMaxUnroll C2 flag
+ - S8023130: (process) ProcessBuilder#inheritIO does not work on Windows
+ - S8023310: Thread contention in the method Beans.IsDesignTime()
+ - S8023472: C2 optimization breaks with G1
+ - S8023580: Add jtreg test for 8004051 and 8005722
+ - S8023720: (hotspot) setjmp/longjmp changes the process signal mask on OS X
+ - S8023786: (jdk) setjmp/longjmp changes the process signal mask on OS X
+ - S8024027: Test sun/misc/IoTrace/IoTraceSocketReadWrite.java crashes VM
+ - S8024163: [macosx] NullPointerException at javax.swing.TransferHandler$DropHandler.handleDrag since jdk8b93, 7u40b28
+ - S8024461: [macosx] Java crashed on mac10.9 for swing and 2d function manual test
+ - S8024521: (process) Async close issues with Process InputStream
+ - S8024707: TransformerException : item() return null with node list of length != 1
+ - S8024830: SEGV in org.apache.lucene.codecs.compressing.CompressingTermVectorsReader.get
+ - S8024861: Incomplete token triggers GSS-API NullPointerException
+ - S8024876: [TEST_BUG] javax/xml/jaxp/parsers/8022548/XOMParserTest.java failed when testbase dir has read only permissions
+ - S8024952: ClassCastException in PlainSocketImpl.accept() when using custom socketImpl
+ - S8025145: [macosx]: java 7 does not recognize tiff image on clipboard
+ - S8025204: Intermittent test failure: javax/management/remote/mandatory/connection/IdleTimeoutTest.java
+ - S8025205: Intermittent test failure: javax/management/remote/mandatory/connection/BrokenConnectionTest.java
+ - S8025206: Intermittent test failure: javax/management/monitor/NullAttributeValueTest.java
+ - S8025207: Intermittent test failure: javax/management/monitor/CounterMonitorThresholdTest.java
+ - S8025255: (tz) Support tzdata2013g
+ - S8025512: NPE with logging while launching webstart on jre7u40 if logging is disabled
+ - S8025713: Syncing indendation/comment/copyright year differences with upstream projects
+ - S8025860: new hotspot build - hs24.60-b02
+ - S8025861: Set minor version for hotspot in 7u60 to 60 and build number to b01
+ - S8025920: webrev.ksh does not provide any details about changes in zip files
+ - S8026293: Schedule part of G1 pre-barrier late
+ - S8026486: Significant slowdown due to transparent huge pages
+ - S8026502: java/lang/invoke/MethodHandleConstants.java fails on all platforms
+ - S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2)
+ - S8027066: XMLDecoder in java 7 cannot properly deserialize object arrays
+ - S8027172: new hotspot build - hs24.60-b03
+ - S8027426: String.toLowerCase incorrectly increases length, if string contains \u0130 char
+ - S8027579: new hotspot build - hs24.60-b04
+ - S8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
+ - S8027839: C1 crashes in Weblogic with G1 enabled
+ - S8027840: C2 allows safepoint checks to leak into G1 pre-barriers
+ - S8027860: [TEST_BUG] File not closed in javax/xml/jaxp/parsers/8022548/XOMParserTest.java
+ - S8027997: G1: SPECjbb2013 crashes due to a broken object reference
+ - S8028054: com.sun.beans.finder.MethodFinder has unsynchronized access to a static Map
+ - S8028215: ORB.init fails with SecurityException if properties select the JDK default ORB
+ - S8028351: JWS doesn't get authenticated when using kerberos auth proxy
+ - S8028412: AsyncGetCallTrace() is broken on x86 in JDK 7u40
+ - S8029304: JFR broken in 7u train for JDK Linux for ARM or OpenJDK
+ - S8029599: JVM crashes on solaris-i586 with -Xverify:all if stack overflow happens during recursive reflective call
* Bug fixes
- - Fix implicit function declarations
- - PR1617: Include defs.make in vm.make so zeroshark.make is included
+ - Fix implicit function declarations
+ - PR1617: Include defs.make in vm.make so zeroshark.make is included
+ - Add Shark definitions from 8003868
+ - D729448: 32-bit alignment on mips and mipsel
+ - Drop compile_method argument removed in 7083786 from sharkCompiler.cpp
+ - Remove binary files and unlicensed generated files
* JamVM
- JVM_NewMultiArray: element class may be an array
- jtreg test java/lang/reflect/Array/ExceedMaxDim
- OpenJDK: Fix Local/Anonymous class checks
- classlibMarkThreadTerminated should return Object*
- Fix race-condition in constant-pool resolution code
- - JSR 292: MethodHandle constant-pool refs may be resolved
- - JSR 292: bootstrap method args error handling
- - JSR 292: correct intrinsic cache COMPARE function
+ - JSR292: MethodHandle constant-pool refs may be resolved
+ - JSR292: bootstrap method args error handling
+ - JSR292: correct intrinsic cache COMPARE function
- Race condition in setting up imethod table
- GC: Minor performance improvement
diff -r 92450bf34748 -r 2ecadf456797 hotspot.map
--- a/hotspot.map Fri Dec 20 11:29:32 2013 +0100
+++ b/hotspot.map Thu Dec 26 23:17:45 2013 +0000
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 9d01164b2dfc 0c0db223f315b31431a802d5f6b7f76d980c4c72eeff680bb1964187b66dd835
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 11e724b1a33d 68edff4b613f9013f6c4779e1712512d02fc24886a53a69f35fa7e9313fce58b
diff -r 92450bf34748 -r 2ecadf456797 patches/boot/break-processbuilder-dependency.patch
--- a/patches/boot/break-processbuilder-dependency.patch Fri Dec 20 11:29:32 2013 +0100
+++ b/patches/boot/break-processbuilder-dependency.patch Thu Dec 26 23:17:45 2013 +0000
@@ -1,9 +1,9 @@
diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2010-09-01 22:21:08.815402468 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2010-09-01 22:23:19.572081778 +0100
-@@ -62,6 +62,32 @@
- private /* final */ InputStream stdout;
- private /* final */ InputStream stderr;
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2013-12-26 22:11:52.199802211 +0000
+@@ -109,6 +109,32 @@
+ });
+ }
+ /**
+ * Required package-private classes taken from
@@ -34,7 +34,7 @@
/* this is for the reaping thread */
private native int waitForProcessExit(int pid);
-@@ -155,15 +181,15 @@
+@@ -211,15 +237,15 @@
void initStreams(int[] fds) throws IOException {
stdin = (fds[0] == -1) ?
@@ -53,16 +53,16 @@
new ProcessPipeInputStream(fds[2]);
processReaperExecutor.execute(new Runnable() {
-@@ -275,7 +301,7 @@
- byte[] stragglers = drainInputStream(in);
- in.close();
- this.in = (stragglers == null) ?
-- ProcessBuilder.NullInputStream.INSTANCE :
-+ NullInputStream.INSTANCE :
- new ByteArrayInputStream(stragglers);
- if (buf == null) // asynchronous close()?
- this.in = null;
-@@ -306,7 +332,7 @@
+@@ -331,7 +357,7 @@
+ }
+ }
+ return (a == null) ?
+- ProcessBuilder.NullInputStream.INSTANCE :
++ NullInputStream.INSTANCE :
+ new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
+ }
+
+@@ -377,7 +403,7 @@
// We know of no reason to get an IOException, but if
// we do, there's nothing else to do but carry on.
}
@@ -72,11 +72,11 @@
}
}
diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2010-09-01 22:21:08.815402468 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2010-09-01 22:22:33.204096111 +0100
-@@ -45,6 +45,32 @@
- private DeferredCloseInputStream stdout_inner_stream;
- private InputStream stderr_stream;
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2013-12-26 22:12:18.024196383 +0000
+@@ -98,6 +98,32 @@
+ });
+ }
+ /**
+ * Required package-private classes taken from
@@ -107,7 +107,7 @@
/* this is for the reaping thread */
private native int waitForProcessExit(int pid);
-@@ -86,7 +112,7 @@
+@@ -145,7 +171,7 @@
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() { public Void run() {
if (std_fds[0] == -1)
@@ -116,7 +116,7 @@
else {
FileDescriptor stdin_fd = new FileDescriptor();
fdAccess.set(stdin_fd, std_fds[0]);
-@@ -95,7 +121,7 @@
+@@ -154,7 +180,7 @@
}
if (std_fds[1] == -1)
@@ -125,7 +125,7 @@
else {
FileDescriptor stdout_fd = new FileDescriptor();
fdAccess.set(stdout_fd, std_fds[1]);
-@@ -104,7 +130,7 @@
+@@ -163,7 +189,7 @@
}
if (std_fds[2] == -1)
diff -r 92450bf34748 -r 2ecadf456797 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Fri Dec 20 11:29:32 2013 +0100
+++ b/patches/boot/ecj-diamond.patch Thu Dec 26 23:17:45 2013 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-07-09 23:52:39.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-12-26 19:50:41.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-12-26 22:23:06.678103309 +0000
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-08 21:17:14.363100612 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-12-26 19:50:41.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-12-26 22:23:06.678103309 +0000
@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -23,8 +23,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-07-09 23:52:39.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-12-26 19:50:41.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-12-26 22:23:06.678103309 +0000
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +44,8 @@
for (WorkerThread wt : copy) {
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 2013-09-20 00:32:35.455450085 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-12-26 22:21:55.853021204 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-12-26 22:23:06.678103309 +0000
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -67,8 +67,8 @@
final String javaName = (String) keys.nextElement();
final String[] mimes = parseMimeTypes(props.getProperty(javaName));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-09-24 16:16:01.128926160 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-12-26 22:23:06.678103309 +0000
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -88,8 +88,8 @@
CACHE.put(actual, map);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-11-30 07:40:05.671148416 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-12-26 22:23:06.678103309 +0000
@@ -62,9 +62,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -104,9 +104,57 @@
private Reference<ClassLoader> loader;
private ExceptionListener listener;
+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 2013-12-26 22:27:51.086449155 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2013-12-26 22:32:25.923332967 +0000
+@@ -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
+
+- private final ReferenceQueue<Object> queue = new ReferenceQueue<>(); // queue for references to remove
++ private final ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); // queue for references to remove
+
+ private volatile CacheEntry<K,V>[] table = newTable(1 << 3); // table's length MUST be a power of two
+ private int threshold = 6; // the next size value at which to resize
+@@ -126,7 +126,7 @@
+ }
+ V value = create(key);
+ Objects.requireNonNull(value, "value");
+- this.table[index] = new CacheEntry<>(hash, key, value, this.table[index]);
++ this.table[index] = new CacheEntry<K,V>(hash, key, value, this.table[index]);
+ if (++this.size >= this.threshold) {
+ if (this.table.length == MAXIMUM_CAPACITY) {
+ this.threshold = Integer.MAX_VALUE;
+@@ -405,21 +405,21 @@
+ public static enum Kind {
+ STRONG {
+ <T> Ref<T> create(Object owner, T value, ReferenceQueue<? super T> queue) {
+- return new Strong<>(owner, value);
++ return new Strong<T>(owner, value);
+ }
+ },
+ SOFT {
+ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
+ return (referent == null)
+- ? new Strong<>(owner, referent)
+- : new Soft<>(owner, referent, queue);
++ ? new Strong<T>(owner, referent)
++ : new Soft<T>(owner, referent, queue);
+ }
+ },
+ WEAK {
+ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
+ return (referent == null)
+- ? new Strong<>(owner, referent)
+- : new Weak<>(owner, referent, queue);
++ ? new Strong<T>(owner, referent)
++ : new Weak<T>(owner, referent, queue);
+ }
+ };
+
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-09-24 16:15:57.304854866 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-12-26 22:23:06.678103309 +0000
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -178,8 +226,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-09-20 00:32:35.727454321 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-12-26 22:23:06.678103309 +0000
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -242,8 +290,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-09-20 00:32:33.939426476 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-12-26 22:21:55.753019677 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-12-26 22:23:06.678103309 +0000
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -254,8 +302,8 @@
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-09-24 16:15:57.308854939 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-12-26 22:23:06.678103309 +0000
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -266,8 +314,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/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-02-08 19:35:17.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-12-26 22:23:06.678103309 +0000
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -304,8 +352,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/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-09-19 18:15:15.900797583 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-12-26 22:23:06.678103309 +0000
@@ -921,7 +921,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -334,8 +382,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-09-20 00:32:35.739454508 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-12-26 22:23:06.678103309 +0000
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -373,8 +421,8 @@
for (String optline : options.split("\n")) {
More information about the distro-pkg-dev
mailing list