/hg/release/icedtea7-2.4: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jan 28 07:38:23 PST 2014
changeset 6737b461b59a in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=6737b461b59a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jan 22 10:46:56 2014 +0000
Remove bug IDs not in Mercurial repositories.
2014-01-22 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Remove bug IDs not in repository.
changeset ceec45b60d01 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=ceec45b60d01
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jan 28 15:37:59 2014 +0000
Bring in non-security changes from u51b31, plus PR1653 & PR1654.
2014-01-28 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(BUILD_VERSION): Set to b31.
(CORBA_CHANGESET): Update to IcedTea 2.4 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: Updated.
* hotspot.map: Update to IcedTea 2.4 HEAD.
* patches/boot/ecj-diamond.patch: Regenerated.
diffstat:
ChangeLog | 24 +
Makefile.am | 26 +-
NEWS | 38 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 3093 +++++++++++++++++++--------------------
5 files changed, 1616 insertions(+), 1567 deletions(-)
diffs (truncated from 4936 to 500 lines):
diff -r a41acae0ba85 -r ceec45b60d01 ChangeLog
--- a/ChangeLog Wed Jan 22 10:08:10 2014 +0000
+++ b/ChangeLog Tue Jan 28 15:37:59 2014 +0000
@@ -1,3 +1,27 @@
+2014-01-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (BUILD_VERSION): Set to b31.
+ (CORBA_CHANGESET): Update to IcedTea 2.4 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: Updated.
+ * hotspot.map: Update to IcedTea 2.4 HEAD.
+ * patches/boot/ecj-diamond.patch: Regenerated.
+
+2014-01-22 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Remove bug IDs not in repository.
+
2014-01-22 Andrew John Hughes <gnu.andrew at redhat.com>
* configure.ac: Bump to 2.4.5pre.
diff -r a41acae0ba85 -r ceec45b60d01 Makefile.am
--- a/Makefile.am Wed Jan 22 10:08:10 2014 +0000
+++ b/Makefile.am Tue Jan 28 15:37:59 2014 +0000
@@ -1,22 +1,22 @@
# Dependencies
JDK_UPDATE_VERSION = 51
-BUILD_VERSION = b00
+BUILD_VERSION = b31
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = e540fd592221
-JAXP_CHANGESET = 2e2bf2d8be16
-JAXWS_CHANGESET = 5aceb5a787b1
-JDK_CHANGESET = 1fe539ed00bc
-LANGTOOLS_CHANGESET = 3f5408abf14b
-OPENJDK_CHANGESET = 796d1bf47b24
+CORBA_CHANGESET = 3594dbde270d
+JAXP_CHANGESET = 8fe156ad49e2
+JAXWS_CHANGESET = 32ea8b1ed91a
+JDK_CHANGESET = a74c2e4a756b
+LANGTOOLS_CHANGESET = dabd37b7e295
+OPENJDK_CHANGESET = 410eb7fef869
-CORBA_SHA256SUM = 77c3285f6abdefe7f19fc4c698ef1f4fe533f38941314e7e7077c34fa5eb4456
-JAXP_SHA256SUM = 48bb8ece00ef62c6c0161dd90e5789419594dfb5d08163781dac9ffc00c0a3f8
-JAXWS_SHA256SUM = ee2a7165b78693c3bb61a90128b60934704e9a5c6c7514abfbb61e41531b9919
-JDK_SHA256SUM = 16373b85dc5123cfe1816ec04f7d14e9a048c6eee7eb7c22b5b816fa1fd5e9bc
-LANGTOOLS_SHA256SUM = 4375ccfacc49793dd0f13cb73ce3c684218bce71008fc237f3b6da754f4dfea6
-OPENJDK_SHA256SUM = abe048022f46f4d04130b2cf6a1b1d897bdca981518349d34fe5b415310f7782
+CORBA_SHA256SUM = d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d
+JAXP_SHA256SUM = 0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3
+JAXWS_SHA256SUM = 08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0
+JDK_SHA256SUM = 1755a0c0439c7b8e0552ece4e24686ecfd64ef886dea0622e0b9f224103674ae
+LANGTOOLS_SHA256SUM = 86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f
+OPENJDK_SHA256SUM = 2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
diff -r a41acae0ba85 -r ceec45b60d01 NEWS
--- a/NEWS Wed Jan 22 10:08:10 2014 +0000
+++ b/NEWS Tue Jan 28 15:37:59 2014 +0000
@@ -14,6 +14,40 @@
New in release 2.4.5 (2014-01-XX):
+* Backports
+ - S8015976: OpenJDK part of bug JDK-8015812 [TEST_BUG] Tests have conflicting test descriptions
+ - S8022698: javax/script/GetInterfaceTest.java fails since 7u45 b04 with -agentvm option
+ - S8022868: missing codepage Cp290 at java runtime
+ - S8023310: Thread contention in the method Beans.IsDesignTime()
+ - S8024461: [macosx] Java crashed on mac10.9 for swing and 2d function manual test
+ - S8025679: Increment minor version of HSx for 7u51 and initialize the build number
+ - S8026037: [TESTBUG] sun/security/tools/jarsigner/warnings.sh test fails on Solaris
+ - S8026304: jarsigner output bad grammar
+ - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing
+ - S8026887: Make issues due to failed large pages allocations easier to debug
+ - S8027204: Revise the update of 8026204 and 8025758
+ - S8027224: test regression - ClassNotFoundException
+ - S8027370: Support tzdata2013h
+ - S8027378: Two closed/javax/xml/8005432 fails with jdk7u51b04
+ - S8027787: 7u51 l10n resource file translation update 1
+ - S8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
+ - S8027943: serial version of com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl changed in 7u45
+ - S8027944: Increment hsx 24.51 build to b02 for 7u51-b07
+ - S8028057: Modify jarsigner man page documentation to document CCC 8024302: Clarify jar verifications
+ - S8028090: reverting change - changeset pushed with incorrect commit message, linked to wrong issue
+ - S8028111: XML readers share the same entity expansion counter
+ - S8028215: ORB.init fails with SecurityException if properties select the JDK default ORB
+ - S8028293: Check local configuration for actual ephemeral port range
+ - S8028382: Two javax/xml/8005433 tests still fail after the fix JDK-8028147
+ - S8028453: AsynchronousSocketChannel.connect() requires SocketPermission due to bind to local address (win)
+ - S8028823: java/net/Makefile tabs converted to spaces
+ - S8029038: Revise fix for XML readers share the same entity expansion counter
+ - S8029842: Increment hsx 24.51 build to b03 for 7u51-b11
+* Bug fixes
+ - Fix broken bootstrap build by updating ecj-multicatch.patch
+ - PR1653: Support ppc64le via Zero
+ - PR1654: ppc32 needs a larger ThreadStackSize to build
+
New in release 2.4.4 (2014-01-14):
* Security fixes
@@ -21,8 +55,8 @@
- S7068126, CVE-2014-0373: Enhance SNMP statuses
- S8010935: Better XML handling
- S8011786, CVE-2014-0368: Better applet networking
- - S8021257, S8025022, CVE-2013-5896 : com.sun.corba.se.** should be on restricted package list
- - S8021271, S8021266, CVE-2014-0408: Better buffering in ObjC code
+ - S8021257, CVE-2013-5896: com.sun.corba.se.** should be on restricted package list
+ - S8021271, CVE-2014-0408: Better buffering in ObjC code
- S8022904: Enhance JDBC Parsers
- S8022927: Input validation for byte/endian conversions
- S8022935: Enhance Apache resolver classes
diff -r a41acae0ba85 -r ceec45b60d01 hotspot.map
--- a/hotspot.map Wed Jan 22 10:08:10 2014 +0000
+++ b/hotspot.map Tue Jan 28 15:37:59 2014 +0000
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot a8a33cc2dd4b cb5f109ae32c07301bc3a017c334ca3a7723124ff217d46127a16ade516d2902
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot cbeecad5efcb 511d0337cf8ab6cfbd9b7d9a5a2dd2a19bad01eb11b33e947154b95ddb46ab0e
diff -r a41acae0ba85 -r ceec45b60d01 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Jan 22 10:08:10 2014 +0000
+++ b/patches/boot/ecj-diamond.patch Tue Jan 28 15:37:59 2014 +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 2013-07-24 21:31:42.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-30 18:32:50.125579213 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-01-23 23:19:18.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-01-28 11:39:19.697588883 +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-24 21:31:42.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-30 18:32:50.141579926 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-01-23 23:19:18.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-01-28 11:39:19.697588883 +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 2013-07-24 21:31:42.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-30 18:32:50.145580045 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-01-23 23:19:18.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-01-28 11:39:19.697588883 +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-07-12 17:07:55.970380942 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:29.097954416 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-01-28 11:38:19.384649230 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-01-28 11:39:19.697588883 +0000
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -66,26 +66,9 @@
while (keys.hasMoreElements()) {
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/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 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-30 18:32:50.149580081 +0100
-@@ -62,9 +62,10 @@
- */
- public final class DocumentHandler extends DefaultHandler {
- private final AccessControlContext acc = AccessController.getContext();
-- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
-- private final Map<String, Object> environment = new HashMap<>();
-- private final List<Object> objects = new ArrayList<>();
-+ private final Map<String, Class<? extends ElementHandler>> handlers =
-+ new HashMap<String, Class<? extends ElementHandler>>();
-+ private final Map<String, Object> environment = new HashMap<String, Object>();
-+ private final List<Object> objects = new ArrayList<Object>();
-
- private Reference<ClassLoader> loader;
- private ExceptionListener listener;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-30 18:32:50.149580081 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-01-28 11:39:19.697588883 +0000
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -104,9 +87,26 @@
prepare(map, actual);
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 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-01-28 11:39:19.697588883 +0000
+@@ -63,9 +63,10 @@
+ */
+ public final class DocumentHandler extends DefaultHandler {
+ private final AccessControlContext acc = AccessController.getContext();
+- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
+- private final Map<String, Object> environment = new HashMap<>();
+- private final List<Object> objects = new ArrayList<>();
++ private final Map<String, Class<? extends ElementHandler>> handlers =
++ new HashMap<String, Class<? extends ElementHandler>>();
++ private final Map<String, Object> environment = new HashMap<String, Object>();
++ private final List<Object> objects = new ArrayList<Object>();
+
+ private Reference<ClassLoader> loader;
+ private ExceptionListener listener;
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 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-07-30 18:32:50.153580096 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-01-28 11:39:19.697588883 +0000
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -178,8 +178,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-07-30 18:18:54.056413584 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-07-30 18:32:50.157580124 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-01-28 11:38:19.400649478 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-01-28 11:39:19.697588883 +0000
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -242,8 +242,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-07-30 18:18:53.968412200 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-30 18:32:50.161580154 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-01-28 11:38:19.296647860 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-01-28 11:39:19.697588883 +0000
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -253,9 +253,21 @@
for (int i = 0; i < nc; i++) {
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 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-01-28 11:39:19.701588945 +0000
+@@ -402,7 +402,7 @@
+ private static Map<Coding, Coding> codeMap;
+
+ private static synchronized Coding of(int B, int H, int S, int del) {
+- if (codeMap == null) codeMap = new HashMap<>();
++ if (codeMap == null) codeMap = new HashMap<Coding, Coding>();
+ Coding x0 = new Coding(B, H, S, del);
+ 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 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-07-30 18:32:50.161580154 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-01-28 11:39:19.701588945 +0000
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -291,21 +303,9 @@
for (int i = start; i < end; i++) {
if (popset.add(values[i])) popvals.add(values[i]);
}
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-30 18:32:50.165580223 +0100
-@@ -402,7 +402,7 @@
- private static Map<Coding, Coding> codeMap;
-
- private static synchronized Coding of(int B, int H, int S, int del) {
-- if (codeMap == null) codeMap = new HashMap<>();
-+ if (codeMap == null) codeMap = new HashMap<Coding, Coding>();
- Coding x0 = new Coding(B, H, S, del);
- Coding x1 = codeMap.get(x0);
- if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-30 18:32:50.169580312 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-01-28 11:39:19.701588945 +0000
@@ -919,7 +919,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -334,8 +334,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-07-30 18:18:54.056413584 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-07-30 18:32:50.173580385 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-01-28 11:38:19.400649478 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-01-28 11:39:19.701588945 +0000
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -373,8 +373,8 @@
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-07-30 18:32:50.173580385 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-01-28 11:39:19.701588945 +0000
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -385,8 +385,8 @@
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-30 18:18:53.972412262 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-07-30 18:32:50.177580449 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-01-28 11:38:19.300647921 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-01-28 11:39:19.701588945 +0000
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -542,8 +542,8 @@
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-07-30 18:18:54.060413647 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-07-30 18:32:50.181580507 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-01-28 11:38:19.400649478 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-01-28 11:39:19.701588945 +0000
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -657,8 +657,8 @@
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-07-30 18:18:54.060413647 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-07-30 18:32:50.185580566 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-01-28 11:38:19.400649478 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-01-28 11:39:19.701588945 +0000
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -714,8 +714,8 @@
for (Class cls : pkg.classes) {
if (!cls.hasInnerClasses()) continue;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-07-30 18:32:50.185580566 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-01-28 11:39:19.701588945 +0000
@@ -183,8 +183,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -746,8 +746,8 @@
for (JarEntry je : Collections.list(jf.entries())) {
InFile inFile = new InFile(jf, je);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-07-30 18:32:50.189580623 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-01-28 11:39:19.701588945 +0000
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -758,8 +758,8 @@
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-07-30 18:18:54.060413647 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-07-30 18:32:50.193580683 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-01-28 11:38:19.400649478 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-01-28 11:39:19.701588945 +0000
@@ -48,8 +48,8 @@
*/
@@ -790,8 +790,8 @@
while (res.remove(null));
return res;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-07-30 18:32:50.193580683 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-01-28 11:39:19.701588945 +0000
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -812,8 +812,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-07-30 18:18:54.060413647 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-07-30 18:32:50.197580747 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-01-28 11:38:19.404649541 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-01-28 11:39:19.701588945 +0000
@@ -233,7 +233,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -824,8 +824,8 @@
String name = file.nameString;
JarEntry je = new JarEntry(Utils.getJarEntryName(name));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-07-30 18:18:54.060413647 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-07-30 18:32:50.201580815 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-01-28 11:38:19.404649541 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-01-28 11:39:19.701588945 +0000
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -836,8 +836,8 @@
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2013-07-30 18:32:50.625587499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-01-28 11:39:19.701588945 +0000
@@ -54,7 +54,7 @@
* Contains event dispatcher per thread group.
*/
@@ -848,8 +848,8 @@
/**
* Constructs a new AbstractLine.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2013-07-30 18:32:50.625587499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-01-28 11:39:19.701588945 +0000
@@ -59,7 +59,7 @@
* dispatcher instance with a factory in EventDispatcher
*/
@@ -860,8 +860,8 @@
/**
* All RealTimeSequencers share this info object.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-07-30 18:32:50.201580815 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-01-28 11:39:19.701588945 +0000
@@ -231,7 +231,7 @@
* Create an empty ExecOptionPermissionCollection.
*/
@@ -872,8 +872,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-07-30 18:32:50.205580881 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-01-28 11:39:19.701588945 +0000
@@ -235,7 +235,7 @@
* Create an empty ExecPermissionCollection.
*/
@@ -884,8 +884,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-07-30 18:32:50.209580944 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-01-28 11:39:19.705589008 +0000
@@ -1284,7 +1284,7 @@
*/
public Collection<?> toCollection() throws SQLException {
@@ -905,8 +905,8 @@
// create a copy
CachedRowSetImpl crsTemp;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-24 21:32:02.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-07-30 18:32:50.213581007 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-01-28 11:39:19.705589008 +0000
@@ -222,7 +222,7 @@
// either of the setter methods have been set.
if(boolColId){
@@ -916,9 +916,21 @@
for(int i=0;i<cRowset.getMatchColumnNames().length;i++) {
if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) {
iMatchKey = cRowset.findColumn(strMatchKey);
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2014-01-23 23:19:20.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2014-01-28 11:39:19.705589008 +0000
+@@ -1180,7 +1180,7 @@
More information about the distro-pkg-dev
mailing list