/hg/release/icedtea7-2.6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 21 22:49:28 UTC 2015
changeset 602943b46405 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=602943b46405
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 21 23:39:42 2015 +0100
Added tag icedtea-2.6.1pre02 for changeset 723ef630c332
changeset 497daefc6304 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=497daefc6304
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 21 23:43:45 2015 +0100
Bump to icedtea-2.6.2.
Upstream changes:
- Bump to icedtea-2.6.2
- S6854417: TESTBUG: java/util/regex/RegExTest.java fails intermittently
- S6966259: Make PrincipalName and Realm immutable
- S8005226: java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java fails intermittently
- S8014097: add doPrivileged methods with limited privilege scope
- S8021191: Add isAuthorized check to limited doPrivileged methods
- S8026119. PR2679: Regression test DHEKeySizing.java failing intermittently
- S8028780: JDK KRB5 module throws OutOfMemoryError when CCache is corrupt
- S8048030, CVE-2015-4734: Expectations should be consistent
- S8064331: JavaSecurityAccess.doIntersectionPrivilege() drops the information about the domain combiner of the stack ACC
- S8068842, CVE-2015-4803: Better JAXP data handling
- S8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner")
- S8076328, PR2679: Enforce key exchange constraints
- S8076339, CVE-2015-4903: Better handling of remote object invocation
- S8076383, CVE-2015-4835: Better CORBA exception handling
- S8076387, CVE-2015-4882: Better CORBA value handling
- S8076392. CVE-2015-4881: Improve IIOPInputStream consistency
- S8076413, CVE-2015-4883: Better JRMP message handling
- S8076506: Increment minor version of HSx for 7u91 and initialize the build number
- S8078427, CVE-2015-4842: More supportive home environment
- S8078440: Safer managed types
- S8078822: 8068842 fix missed one new file PrimeNumberSequenceGenerator.java
- S8079323: Serialization compatibility for Templates: need to exclude Hashtable from serialization
- S8080541: More direct property handling
- S8080688, CVE-2015-4860: Service for DGC services
- S8081760: Better group dynamics
- S8081760, PR2679: Better group dynamics
- S8086092, CVE-2015-4840: More palette improvements
- S8086733, CVE-2015-4893: Improve namespace handling
- S8087118: Remove missing package from java.security files
- S8087350: Improve array conversions
- S8098547: (tz) Support tzdata2015e
- S8103671, CVE-2015-4805: More objective stream classes
- S8103675: Better Binary searches
- S8130078, CVE-2015-4911: Document better processing
- S8130193, CVE-2015-4806: Improve HTTP connections
- S8130253: ObjectStreamClass.getFields too restrictive
- S8130864: Better server identity handling
- S8130891, CVE-2015-4843: (bf) More direct buffering
- S8131291, CVE-2015-4872: Perfect parameter patterning
- S8132042, CVE-2015-4844: Preserve layout presentation
- S8133321: (tz) Support tzdata2015f
- S8135043: ObjectStreamClass.getField(String) too restrictive
2015-10-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 91.
(CORBA_CHANGESET): Update to icedtea-2.6.2.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.6.2.
* hotspot.map.in: Update to icedtea-2.6.2.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new case in sun.security.ssl.DHCrypt
and numerous ones in JAXP.
* patches/boot/ecj-multicatch.patch:
Add new case in sun.security.krb5.PrincipalName.
* patches/boot/ecj-trywithresources.patch:
Regenerated.
diffstat:
.hgtags | 1 +
ChangeLog | 27 +
Makefile.am | 28 +-
NEWS | 45 +-
configure.ac | 2 +-
hotspot.map.in | 2 +-
patches/boot/ecj-diamond.patch | 2861 +++++++++++++++++++++++-------
patches/boot/ecj-multicatch.patch | 14 +
patches/boot/ecj-trywithresources.patch | 154 +-
9 files changed, 2374 insertions(+), 760 deletions(-)
diffs (truncated from 5619 to 500 lines):
diff -r 723ef630c332 -r 497daefc6304 .hgtags
--- a/.hgtags Tue Oct 20 04:30:23 2015 +0100
+++ b/.hgtags Wed Oct 21 23:43:45 2015 +0100
@@ -59,3 +59,4 @@
04264787379db3f91a819d38094c31e722dbb592 icedtea-2.6.0
a72975789761e157c95faacd8ce44f6f8322a85d icedtea-2.6-branchpoint
b8d84923480c04deac3d2d34bed05e74a23c8759 icedtea-2.6.1
+723ef630c33266f7339980d3d59439dba7143bba icedtea-2.6.1pre02
diff -r 723ef630c332 -r 497daefc6304 ChangeLog
--- a/ChangeLog Tue Oct 20 04:30:23 2015 +0100
+++ b/ChangeLog Wed Oct 21 23:43:45 2015 +0100
@@ -1,3 +1,30 @@
+2015-10-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 91.
+ (CORBA_CHANGESET): Update to icedtea-2.6.2.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.6.2.
+ * hotspot.map.in: Update to icedtea-2.6.2.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add new case in sun.security.ssl.DHCrypt
+ and numerous ones in JAXP.
+ * patches/boot/ecj-multicatch.patch:
+ Add new case in sun.security.krb5.PrincipalName.
+ * patches/boot/ecj-trywithresources.patch:
+ Regenerated.
+
2015-10-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 723ef630c332 -r 497daefc6304 Makefile.am
--- a/Makefile.am Tue Oct 20 04:30:23 2015 +0100
+++ b/Makefile.am Wed Oct 21 23:43:45 2015 +0100
@@ -1,22 +1,22 @@
# Dependencies
-JDK_UPDATE_VERSION = 85
+JDK_UPDATE_VERSION = 91
BUILD_VERSION = b01
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 0445c54dcfb6
-JAXP_CHANGESET = 4e264c1f6b2f
-JAXWS_CHANGESET = e8660c5ef3e5
-JDK_CHANGESET = 7eedb55d47ce
-LANGTOOLS_CHANGESET = d627a940b6ca
-OPENJDK_CHANGESET = d27c76db0808
-
-CORBA_SHA256SUM = e162233c3c85eaafd3815229b14a2b75236d37eb3cc07a0f984c69f10b20f06b
-JAXP_SHA256SUM = da21c52b04e5296c9fcfb14b4597789b119991fac76339b2c60d93787a82bbad
-JAXWS_SHA256SUM = d077a86235d26def4d7bbed25116077a09a4fe3bb8a83339f45761b973445822
-JDK_SHA256SUM = e5f88bc7082fa2b9ff3176f9d93863c850076b5a6358c0ea8573b1b2f3523801
-LANGTOOLS_SHA256SUM = 11019f763aed4d937bc5958426e361963122939969dc199fda4a41423b221133
-OPENJDK_SHA256SUM = 9fdb2ba4db44d16b27314acd054ff52e86ec39f1e80a661e39234c4d076ccd98
+CORBA_CHANGESET = a4d55c5cec23
+JAXP_CHANGESET = f1202fb27695
+JAXWS_CHANGESET = 14c411b1183c
+JDK_CHANGESET = db69ae53157a
+LANGTOOLS_CHANGESET = 73356b81c5c7
+OPENJDK_CHANGESET = 601ca7147b8c
+
+CORBA_SHA256SUM = 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af
+JAXP_SHA256SUM = 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0
+JAXWS_SHA256SUM = 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4
+JDK_SHA256SUM = 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1
+LANGTOOLS_SHA256SUM = a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335
+OPENJDK_SHA256SUM = 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49
DROP_URL = http://icedtea.classpath.org/download/drops
diff -r 723ef630c332 -r 497daefc6304 NEWS
--- a/NEWS Tue Oct 20 04:30:23 2015 +0100
+++ b/NEWS Wed Oct 21 23:43:45 2015 +0100
@@ -12,14 +12,55 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.6.2 (2015-10-XX):
+New in release 2.6.2 (2015-10-21):
+* Security fixes
+ - S8048030, CVE-2015-4734: Expectations should be consistent
+ - S8068842, CVE-2015-4803: Better JAXP data handling
+ - S8076339, CVE-2015-4903: Better handling of remote object invocation
+ - S8076383, CVE-2015-4835: Better CORBA exception handling
+ - S8076387, CVE-2015-4882: Better CORBA value handling
+ - S8076392. CVE-2015-4881: Improve IIOPInputStream consistency
+ - S8076413, CVE-2015-4883: Better JRMP message handling
+ - S8078427, CVE-2015-4842: More supportive home environment
+ - S8078440: Safer managed types
+ - S8080541: More direct property handling
+ - S8080688, CVE-2015-4860: Service for DGC services
+ - S8081760: Better group dynamics
+ - S8086092, CVE-2015-4840: More palette improvements
+ - S8086733, CVE-2015-4893: Improve namespace handling
+ - S8087350: Improve array conversions
+ - S8103671, CVE-2015-4805: More objective stream classes
+ - S8103675: Better Binary searches
+ - S8130078, CVE-2015-4911: Document better processing
+ - S8130193, CVE-2015-4806: Improve HTTP connections
+ - S8130864: Better server identity handling
+ - S8130891, CVE-2015-4843: (bf) More direct buffering
+ - S8131291, CVE-2015-4872: Perfect parameter patterning
+ - S8132042, CVE-2015-4844: Preserve layout presentation
* Import of OpenJDK 7 u85 build 2
- S8133968: Revert 8014464 on OpenJDK 7
- S8133993: [TEST_BUG] Make CipherInputStreamExceptions compile on OpenJDK 7
- S8134248: Fix recently backported tests to work with OpenJDK 7u
- S8134610: Mac OS X build fails after July 2015 CPU
- S8134618: test/javax/xml/jaxp/transform/8062923/XslSubstringTest.java has bad license header
+* Import of OpenJDK 7 u91 build 1
+ - S6854417: TESTBUG: java/util/regex/RegExTest.java fails intermittently
+ - S6966259: Make PrincipalName and Realm immutable
+ - S8005226: java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java fails intermittently
+ - S8014097: add doPrivileged methods with limited privilege scope
+ - S8021191: Add isAuthorized check to limited doPrivileged methods
+ - S8028780: JDK KRB5 module throws OutOfMemoryError when CCache is corrupt
+ - S8064331: JavaSecurityAccess.doIntersectionPrivilege() drops the information about the domain combiner of the stack ACC
+ - S8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner")
+ - S8076506: Increment minor version of HSx for 7u91 and initialize the build number
+ - S8078822: 8068842 fix missed one new file PrimeNumberSequenceGenerator.java
+ - S8079323: Serialization compatibility for Templates: need to exclude Hashtable from serialization
+ - S8087118: Remove missing package from java.security files
+ - S8098547: (tz) Support tzdata2015e
+ - S8130253: ObjectStreamClass.getFields too restrictive
+ - S8133321: (tz) Support tzdata2015f
+ - S8135043: ObjectStreamClass.getField(String) too restrictive
* Backports
- S6880559, PR2674: Enable PKCS11 64-bit windows builds
- S6904403, PR2674: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
@@ -46,6 +87,7 @@
- S8022683, PR2560: JNI GetStringUTFChars should return NULL on allocation failure not abort the VM
- S8023052, PR2509: JVM crash in native layout
- S8025922, PR2560: JNI access to Strings need to check if the value field is non-null
+ - S8026119. PR2679: Regression test DHEKeySizing.java failing intermittently
- S8027624, PR2674: com/sun/crypto/provider/KeyFactory/TestProviderLeak.java unstable again
- S8033069, PR2674: mouse wheel scroll closes combobox popup
- S8035150, PR2674: ShouldNotReachHere() in ConstantPool::copy_entry_to
@@ -68,6 +110,7 @@
- S8075609, PR2674: java.lang.IllegalArgumentException: aContainer is not a focus cycle root of aComponent
- S8075773, PR2674: jps running as root fails after the fix of JDK-8050807
- S8076040, PR2674: Test com/sun/crypto/provider/KeyFactory/TestProviderLeak.java fails with -XX:+UseG1GC
+ - S8076328, PR2679: Enforce key exchange constraints
- S8076455, PR2674: IME Composition Window is displayed on incorrect position
- S8076968, PR2674: PICL based initialization of L2 cache line size on some SPARC systems is incorrect
- S8077102, PR2674: dns_lookup_realm should be false by default
diff -r 723ef630c332 -r 497daefc6304 configure.ac
--- a/configure.ac Tue Oct 20 04:30:23 2015 +0100
+++ b/configure.ac Wed Oct 21 23:43:45 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.2pre02], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.2], [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 723ef630c332 -r 497daefc6304 hotspot.map.in
--- a/hotspot.map.in Tue Oct 20 04:30:23 2015 +0100
+++ b/hotspot.map.in Wed Oct 21 23:43:45 2015 +0100
@@ -1,2 +1,2 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1500c88d1b61 19b5125a8e1283bf6b5a00194a00991b9522b7a92fe0efd152ef303030e831bd
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ f40363c11191 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a
diff -r 723ef630c332 -r 497daefc6304 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Tue Oct 20 04:30:23 2015 +0100
+++ b/patches/boot/ecj-diamond.patch Wed Oct 21 23:43:45 2015 +0100
@@ -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 2015-07-19 18:19:26.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-07-21 02:17:38.248674954 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-10-21 03:15:30.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-10-21 17:49:55.140534918 +0100
@@ -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/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-07-19 18:19:26.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-07-21 02:17:38.248674954 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-10-21 03:15:30.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2015-10-21 17:49:55.140534918 +0100
@@ -50,7 +50,7 @@
*/
private class HookPutFields extends ObjectOutputStream.PutField
@@ -23,8 +23,8 @@
/**
* Put the value of the named boolean field into the persistent field.
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 2015-07-19 18:19:26.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-07-21 02:17:38.248674954 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-10-21 03:15:30.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-10-21 17:49:55.140534918 +0100
@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -35,8 +35,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 2015-07-19 18:19:26.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-07-21 02:17:38.248674954 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-10-21 03:15:30.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-10-21 17:49:55.140534918 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -55,10 +55,496 @@
}
for (WorkerThread wt : copy) {
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2015-10-21 03:15:31.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2015-10-21 19:15:33.302018256 +0100
+@@ -192,7 +192,7 @@
+ NodeSet dist = new NodeSet();
+ dist.setShouldCacheNodes(true);
+
+- Map<String, Node> stringTable = new HashMap<>();
++ Map<String, Node> stringTable = new HashMap<String,Node>();
+
+ for (int i = 0; i < nl.getLength(); i++)
+ {
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2015-10-21 03:15:31.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2015-10-21 18:37:37.644294241 +0100
+@@ -220,7 +220,7 @@
+ public Map<String, Object> getEnvironmentHash()
+ {
+ // Setup a hash to store various environment information in
+- Map<String, Object> hash = new HashMap<>();
++ Map<String, Object> hash = new HashMap<String,Object>();
+
+ // Call various worker methods to fill in the hash
+ // These are explicitly separate for maintenance and so
+@@ -523,7 +523,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String, Object>();
+
+ // Grab java version for later use
+ try
+@@ -620,7 +620,7 @@
+ || (0 == jars.length))
+ return null;
+
+- List<Map> v = new ArrayList<>();
++ List<Map> v = new ArrayList<Map>();
+ StringTokenizer st = new StringTokenizer(cp, File.pathSeparator);
+
+ while (st.hasMoreTokens())
+@@ -641,7 +641,7 @@
+ // If any requested jarName exists, report on
+ // the details of that .jar file
+ try {
+- Map<String, String> h = new HashMap<>(2);
++ Map<String, String> h = new HashMap<String,String>(2);
+ // Note "-" char is looked for in appendFoundJars
+ h.put(jars[i] + "-path", f.getAbsolutePath());
+
+@@ -660,7 +660,7 @@
+ /* no-op, don't add it */
+ }
+ } else {
+- Map<String, String> h = new HashMap<>(2);
++ Map<String, String> h = new HashMap<String,String>(2);
+ // Note "-" char is looked for in appendFoundJars
+ h.put(jars[i] + "-path", WARNING + " Classpath entry: "
+ + filename + " does not exist");
+@@ -737,7 +737,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String,Object>();
+
+ Class clazz = null;
+
+@@ -768,7 +768,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String,Object>();
+
+ try
+ {
+@@ -854,7 +854,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String, Object>();
+
+ try
+ {
+@@ -915,7 +915,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String, Object>();
+
+ try
+ {
+@@ -945,7 +945,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String, Object>();
+
+ final String DOM_CLASS = "org.w3c.dom.Document";
+ final String DOM_LEVEL3_METHOD = "getDoctype"; // no parameter
+@@ -980,7 +980,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String, Object>();
+
+ final String DOM_LEVEL2_CLASS = "org.w3c.dom.Document";
+ final String DOM_LEVEL2_METHOD = "createElementNS"; // String, String
+@@ -1056,7 +1056,7 @@
+ {
+
+ if (null == h)
+- h = new HashMap<>();
++ h = new HashMap<String, Object>();
+
+ final String SAX_VERSION1_CLASS = "org.xml.sax.Parser";
+ final String SAX_VERSION1_METHOD = "parse"; // String
+@@ -1146,7 +1146,7 @@
+ */
+ static
+ {
+- Map<Long, String> jarVersions = new HashMap<>();
++ Map<Long, String> jarVersions = new HashMap<Long, String>();
+ jarVersions.put(new Long(857192), "xalan.jar from xalan-j_1_1");
+ jarVersions.put(new Long(440237), "xalan.jar from xalan-j_1_2");
+ jarVersions.put(new Long(436094), "xalan.jar from xalan-j_1_2_1");
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2015-10-21 03:15:31.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2015-10-21 18:29:16.188748183 +0100
+@@ -51,7 +51,7 @@
+ /**
+ * Legal conversions between internal types.
+ */
+- private static final MultiHashtable<Type, Type> InternalTypeMap = new MultiHashtable<>();
++ private static final MultiHashtable<Type, Type> InternalTypeMap = new MultiHashtable<Type, Type>();
+
+ static {
+ // Possible type conversions between internal types
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2015-10-21 03:15:31.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2015-10-21 18:29:40.548337191 +0100
+@@ -139,7 +139,7 @@
+ private boolean _isStatic = false;
+
+ // Legal conversions between internal and Java types.
+- private static final MultiHashtable<Type, JavaType> _internal2Java = new MultiHashtable<>();
++ private static final MultiHashtable<Type, JavaType> _internal2Java = new MultiHashtable<Type, JavaType>();
+
+ // Legal conversions between Java and internal types.
+ private static final Map<Class<?>, Type> JAVA2INTERNAL;
+@@ -254,9 +254,9 @@
+
+ _internal2Java.makeUnmodifiable();
+
+- Map<Class<?>, Type> java2Internal = new HashMap<>();
+- Map<String, String> extensionNamespaceTable = new HashMap<>();
+- Map<String, String> extensionFunctionTable = new HashMap<>();
++ Map<Class<?>, Type> java2Internal = new HashMap<Class<?>,Type>();
++ Map<String, String> extensionNamespaceTable = new HashMap<String,String>();
++ Map<String, String> extensionFunctionTable = new HashMap<String,String>();
+
+ // Possible conversions between Java and internal types
+ java2Internal.put(Boolean.TYPE, Type.Boolean);
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2015-10-21 03:15:31.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2015-10-21 18:30:45.839235776 +0100
+@@ -106,7 +106,7 @@
+
+ // Check if we have any declared namesaces
+ if (_accessedPrefixes == null) {
+- _accessedPrefixes = new HashMap<>();
++ _accessedPrefixes = new HashMap<String,String>();
+ }
+ else {
+ if (!declared) {
+@@ -168,7 +168,7 @@
+ */
+ public void addAttribute(SyntaxTreeNode attribute) {
+ if (_attributeElements == null) {
+- _attributeElements = new ArrayList<>(2);
++ _attributeElements = new ArrayList<SyntaxTreeNode>(2);
+ }
+ _attributeElements.add(attribute);
+ }
+@@ -178,7 +178,7 @@
+ */
+ public void setFirstAttribute(SyntaxTreeNode attribute) {
+ if (_attributeElements == null) {
+- _attributeElements = new ArrayList<>(2);
++ _attributeElements = new ArrayList<SyntaxTreeNode>(2);
+ }
+ _attributeElements.add(0, attribute);
+ }
+@@ -204,7 +204,7 @@
+ * to _ANY_ namespace URI. Used by literal result elements to determine
+ */
+ public Set<Map.Entry<String, String>> getNamespaceScope(SyntaxTreeNode node) {
+- Map<String, String> all = new HashMap<>();
++ Map<String, String> all = new HashMap<String,String>();
+
+ while (node != null) {
+ Map<String, String> mapping = node.getPrefixMapping();
+@@ -444,7 +444,7 @@
+ }
+ else if (node instanceof XslAttribute) {
+ if (attrsTable == null) {
+- attrsTable = new HashMap<>();
++ attrsTable = new HashMap<String,SyntaxTreeNode>();
+ for (int k = 0; k < i; k++) {
+ SyntaxTreeNode n = _attributeElements.get(k);
+ if (n instanceof LiteralAttribute) {
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2015-10-21 03:15:31.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2015-10-21 18:32:27.729517428 +0100
+@@ -129,22 +129,22 @@
+ /**
+ * A mapping between templates and test sequences.
+ */
+- private Map<Template, Object> _neededTemplates = new HashMap<>();
++ private Map<Template, Object> _neededTemplates = new HashMap<Template,Object>();
+
+ /**
+ * A mapping between named templates and Mode objects.
+ */
+- private Map<Template, Mode> _namedTemplates = new HashMap<>();
++ private Map<Template, Mode> _namedTemplates = new HashMap<Template,Mode>();
+
+ /**
+ * A mapping between templates and instruction handles.
+ */
+- private Map<Template, InstructionHandle> _templateIHs = new HashMap<>();
++ private Map<Template, InstructionHandle> _templateIHs = new HashMap<Template,InstructionHandle>();
+
+ /**
+ * A mapping between templates and instruction lists.
+ */
+- private Map<Template, InstructionList> _templateILs = new HashMap<>();
++ private Map<Template, InstructionList> _templateILs = new HashMap<Template,InstructionList>();
+
+ /**
+ * A reference to the pattern matching the root node.
+@@ -196,7 +196,7 @@
+
+ public String functionName(int min, int max) {
+ if (_importLevels == null) {
+- _importLevels = new HashMap<>();
++ _importLevels = new HashMap<Integer,Integer>();
+ }
+ _importLevels.put(max, min);
+ return _methodName + '_' + max;
+@@ -1074,10 +1074,10 @@
+ final Vector names = xsltc.getNamesIndex();
+
+ // Clear some datastructures
+- _namedTemplates = new HashMap<>();
+- _neededTemplates = new HashMap<>();
+- _templateIHs = new HashMap<>();
+- _templateILs = new HashMap<>();
++ _namedTemplates = new HashMap<Template,Mode>();
++ _neededTemplates = new HashMap<Template,Object>();
++ _templateIHs = new HashMap<Template,InstructionHandle>();
++ _templateILs = new HashMap<Template,InstructionList>();
+ _patternGroups = new Vector[32];
+ _rootPattern = null;
+
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2015-10-21 03:15:31.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2015-10-21 18:39:28.606425331 +0100
+@@ -107,11 +107,11 @@
+ }
+
More information about the distro-pkg-dev
mailing list