/hg/icedtea7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jan 16 16:41:20 PST 2013
changeset 2718234602c7 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2718234602c7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jan 17 00:37:19 2013 +0000
Update to 7u12 b09.
2013-01-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/hotspot/zero/6924259-string_offset.patch:
Remove patch missed in last but one change.
* Makefile.am:
(OPENJDK_VERSION): Bump to b09.
(CORBA_CHANGESET): Update to IcedTea7 forest 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.
(JAXWS): Fix paths, including both JAXWS and JAF.
(JAXWS_COND): Removed.
(OPENJDK_SOURCEPATH_DIRS): Add JAXWS source tree,
required by new implementaton of java.lang.invoke
that relies on the copy of ASM in the JAXWS tree.
* hotspot.map: Update to IcedTea7 forest head.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-multicatch.patch,
* patches/boot/ecj-stringswitch.patch,
* patches/boot/ecj-trywithresources.patch:
Updated due to changes from the security patches
and warning fixes in rmic.
changeset e342c6b2cbc0 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e342c6b2cbc0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jan 17 00:39:24 2013 +0000
Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
2013-01-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Depend on
IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that
ENABLE_CACAO and ENABLE_JAMVM are set. This
makes the tests work correctly again and means
that Zero is turned on automatically where there
is no CACAO or JamVM and the architecture is not
supported by a HotSpot JIT.
diffstat:
ChangeLog | 42 +
Makefile.am | 38 +-
acinclude.m4 | 2 +
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 508 ++++++++++++
patches/boot/ecj-multicatch.patch | 80 +
patches/boot/ecj-stringswitch.patch | 394 +++++----
patches/boot/ecj-trywithresources.patch | 94 ++
patches/hotspot/zero/6924259-string_offset.patch | 934 -----------------------
9 files changed, 954 insertions(+), 1140 deletions(-)
diffs (truncated from 2223 to 500 lines):
diff -r bf3fe7bcc615 -r e342c6b2cbc0 ChangeLog
--- a/ChangeLog Wed Jan 16 01:38:30 2013 +0000
+++ b/ChangeLog Thu Jan 17 00:39:24 2013 +0000
@@ -1,3 +1,45 @@
+2013-01-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_ENABLE_ZERO_BUILD): Depend on
+ IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that
+ ENABLE_CACAO and ENABLE_JAMVM are set. This
+ makes the tests work correctly again and means
+ that Zero is turned on automatically where there
+ is no CACAO or JamVM and the architecture is not
+ supported by a HotSpot JIT.
+
+2013-01-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/hotspot/zero/6924259-string_offset.patch:
+ Remove patch missed in last but one change.
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b09.
+ (CORBA_CHANGESET): Update to IcedTea7 forest 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.
+ (JAXWS): Fix paths, including both JAXWS and JAF.
+ (JAXWS_COND): Removed.
+ (OPENJDK_SOURCEPATH_DIRS): Add JAXWS source tree,
+ required by new implementaton of java.lang.invoke
+ that relies on the copy of ASM in the JAXWS tree.
+ * hotspot.map: Update to IcedTea7 forest head.
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-multicatch.patch,
+ * patches/boot/ecj-stringswitch.patch,
+ * patches/boot/ecj-trywithresources.patch:
+ Updated due to changes from the security patches
+ and warning fixes in rmic.
+
2013-01-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Add 2.1.4, 2.2.4 and 2.3.4 release
diff -r bf3fe7bcc615 -r e342c6b2cbc0 Makefile.am
--- a/Makefile.am Wed Jan 16 01:38:30 2013 +0000
+++ b/Makefile.am Thu Jan 17 00:39:24 2013 +0000
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b06
+OPENJDK_VERSION = b09
JDK_UPDATE_VERSION = 12
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 1fc876ad27f5
-JAXP_CHANGESET = b67573b17099
-JAXWS_CHANGESET = 8c8c122d0fa8
-JDK_CHANGESET = 880acd2bf8d1
-LANGTOOLS_CHANGESET = 698d52b36615
-OPENJDK_CHANGESET = 9b35dbaf2afa
+CORBA_CHANGESET = 679412ed11d5
+JAXP_CHANGESET = cba4d3377850
+JAXWS_CHANGESET = a7541d353428
+JDK_CHANGESET = bbfd732ae37d
+LANGTOOLS_CHANGESET = 31539542e9e5
+OPENJDK_CHANGESET = 2d1ddf672d61
-CORBA_SHA256SUM = 2945cef860c0a3e5af69ffe370ed762bb620db855f97e16efef5b639144e3d93
-JAXP_SHA256SUM = 4eb3f831cb486c81e16ac5d37b30e0e309ba8e2e8d4a400382ee4fa0790ca268
-JAXWS_SHA256SUM = 35e075fc9d4c9de7df8905cf3238e87a9388e4028ff984b494b7fb6c36fd17e1
-JDK_SHA256SUM = c6db11a2f5e90f37a37d65615d7e5ffa0e0e066e4eb303cc98e23ac245b3425d
-LANGTOOLS_SHA256SUM = 6ec950b34cb8cc1c6aa64e25b492952a3ba0a53370bb6e5d5431922fa940b506
-OPENJDK_SHA256SUM = c42c018e3f2a5037d9c07e98ffb8784a732c5e1ebd5bb18c3587ca0e8825b27b
+CORBA_SHA256SUM = 20b9840fa09f8e89a141cbe0b08794588f8534ba760cf08cee34feaea3018bc4
+JAXP_SHA256SUM = d04ae1702118dd42e5f7c3796dab0214a44f27b8381464536877cded732f6b77
+JAXWS_SHA256SUM = ada222989022c456d6ebd417891fb4b575d47da1134bd0ca631fb5deea7cbed8
+JDK_SHA256SUM = f3e534cabdf0892b8311133da977823bbecabab7cf5f8a5115ef4fd3b2f81b06
+LANGTOOLS_SHA256SUM = 7cc3816acebfeac0211161cc39472b38f87587f4d41fa3e153109e27df4c02c8
+OPENJDK_SHA256SUM = 43aef86d067f66f2cd3b6895cc166e056b05603ee585ba50b5a82d41e7924a16
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -73,7 +73,7 @@
SOLARIS = openjdk-boot/jdk/src/solaris/classes
LANGTOOLS = openjdk-boot/langtools/src/share/classes
CORBA = openjdk-boot/corba/src/share/classes
-JAXWS = openjdk-boot/jaxws/sources/jaxws_src/src
+JAXWS = openjdk-boot/jaxws/src/share/jaxws_classes:openjdk-boot/jaxws/src/share/jaf_classes
PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
@@ -85,16 +85,8 @@
PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-if DTDTYPE_QNAME
-JAXWS_COND = $(JAXWS)
-endif
-
-if LACKS_JAVAX_ANNOTATION_RESOURCE
-JAXWS_COND = $(JAXWS)
-endif
-
OPENJDK_SOURCEPATH_DIRS = \
- $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS_COND)
+ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
diff -r bf3fe7bcc615 -r e342c6b2cbc0 acinclude.m4
--- a/acinclude.m4 Wed Jan 16 01:38:30 2013 +0000
+++ b/acinclude.m4 Thu Jan 17 00:39:24 2013 +0000
@@ -653,6 +653,8 @@
AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD],
[
AC_REQUIRE([IT_SET_ARCH_SETTINGS])
+ AC_REQUIRE([IT_ENABLE_CACAO])
+ AC_REQUIRE([IT_ENABLE_JAMVM])
AC_MSG_CHECKING([whether to use the zero-assembler port])
use_zero=no
AC_ARG_ENABLE([zero],
diff -r bf3fe7bcc615 -r e342c6b2cbc0 hotspot.map
--- a/hotspot.map Wed Jan 16 01:38:30 2013 +0000
+++ b/hotspot.map Thu Jan 17 00:39:24 2013 +0000
@@ -1,1 +1,1 @@
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot a57f19258524 334a0eedef7b45c624885460a214bf697154e6611ef5d6874d506c258db27a5d
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 7e12b7098f20 dc85dde54f736507e83f718a587020b89d5e6c532a33a18cabd17dedef5db80b
diff -r bf3fe7bcc615 -r e342c6b2cbc0 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Jan 16 01:38:30 2013 +0000
+++ b/patches/boot/ecj-diamond.patch Thu Jan 17 00:39:24 2013 +0000
@@ -6437,3 +6437,511 @@
List<Thread> threads = new ArrayList<Thread>();
for (int i = 0; i < threadCount; i++) {
RandomCollector r = new RandomCollector();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2013-01-16 02:31:22.300240401 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2013-01-16 02:31:46.772630169 +0000
+@@ -78,9 +78,9 @@
+ /* indicate compatibility with JDK 1.1.x version of class */
+ private static final long serialVersionUID = 4666870661827494597L;
+ private Hashtable<String, Remote> bindings
+- = new Hashtable<>(101);
++ = new Hashtable<String, Remote>(101);
+ private static Hashtable<InetAddress, InetAddress> allowedAccessCache
+- = new Hashtable<>(3);
++ = new Hashtable<InetAddress, InetAddress>(3);
+ private static RegistryImpl registry;
+ private static ObjID id = new ObjID(ObjID.REGISTRY_ID);
+
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-01-16 02:31:22.308240528 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-01-16 02:37:55.086500471 +0000
+@@ -66,10 +66,10 @@
+
+ /** maps persistent IDs to activated remote objects */
+ private final Hashtable<ActivationID,ActiveEntry> active =
+- new Hashtable<>();
++ new Hashtable<ActivationID,ActiveEntry>();
+ private boolean groupInactive = false;
+ private final ActivationGroupID groupID;
+- private final List<ActivationID> lockedIDs = new ArrayList<>();
++ private final List<ActivationID> lockedIDs = new ArrayList<ActivationID>();
+
+ /**
+ * Creates a default activation group implementation.
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-01-16 02:31:22.316240656 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-01-16 02:38:14.518810403 +0000
+@@ -112,11 +112,11 @@
+ * garbage collected.
+ */
+ private static final HashMap<LoaderKey, LoaderEntry> loaderTable
+- = new HashMap<>(5);
++ = new HashMap<LoaderKey, LoaderEntry>(5);
+
+ /** reference queue for cleared class loader entries */
+ private static final ReferenceQueue<Loader> refQueue
+- = new ReferenceQueue<>();
++ = new ReferenceQueue<Loader>();
+
+ /*
+ * Disallow anyone from creating one of these.
+@@ -776,7 +776,7 @@
+
+ /** map from weak(key=string) to [URL[], soft(key)] */
+ private static final Map<String, Object[]> pathToURLsCache
+- = new WeakHashMap<>(5);
++ = new WeakHashMap<String, Object[]>(5);
+
+ /**
+ * Convert an array of URL objects into a corresponding string
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2013-01-16 02:31:22.324240784 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2013-01-16 02:38:36.627163040 +0000
+@@ -65,14 +65,14 @@
+
+ /** table to hold sun classes to which access is explicitly permitted */
+ protected static Map<String, Class<?>> permittedSunClasses
+- = new HashMap<>(3);
++ = new HashMap<String, Class<?>>(3);
+
+ /** if true, don't try superclass first in resolveClass() */
+ private boolean skipDefaultResolveClass = false;
+
+ /** callbacks to make when done() called: maps Object to Runnable */
+ private final Map<Object, Runnable> doneCallbacks
+- = new HashMap<>(3);
++ = new HashMap<Object, Runnable>(3);
+
+ /**
+ * if true, load classes (if not available locally) only from the
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2013-01-16 02:31:22.336240974 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2013-01-16 02:39:03.071584874 +0000
+@@ -537,7 +537,7 @@
+ HashToMethod_Maps() {}
+
+ protected Map<Long,Method> computeValue(Class<?> remoteClass) {
+- Map<Long,Method> map = new HashMap<>();
++ Map<Long,Method> map = new HashMap<Long,Method>();
+ for (Class<?> cl = remoteClass;
+ cl != null;
+ cl = cl.getSuperclass())
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2013-01-16 02:31:22.344241102 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2013-01-16 02:39:18.027823469 +0000
+@@ -207,7 +207,7 @@
+ * @throws NullPointerException if remoteClass is null
+ */
+ private static Class<?>[] getRemoteInterfaces(Class<?> remoteClass) {
+- ArrayList<Class<?>> list = new ArrayList<>();
++ ArrayList<Class<?>> list = new ArrayList<Class<?>>();
+ getRemoteInterfaces(list, remoteClass);
+ return list.toArray(new Class<?>[list.size()]);
+ }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2013-01-16 02:31:22.352241229 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2013-01-16 02:39:39.284162590 +0000
+@@ -46,7 +46,7 @@
+ **/
+ public abstract class WeakClassHashMap<V> {
+
+- private Map<Class<?>,ValueCell<V>> internalMap = new WeakHashMap<>();
++ private Map<Class<?>,ValueCell<V>> internalMap = new WeakHashMap<Class<?>,ValueCell<V>>();
+
+ protected WeakClassHashMap() { }
+
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2013-01-16 02:31:22.360241357 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2013-01-16 02:37:32.806145141 +0000
+@@ -43,7 +43,7 @@
+ private boolean dgcAckNeeded = false;
+
+ /** Hashtable mapping Endpoints to lists of LiveRefs to register */
+- private Map<Endpoint, List<LiveRef>> incomingRefTable = new HashMap<>(5);
++ private Map<Endpoint, List<LiveRef>> incomingRefTable = new HashMap<Endpoint, List<LiveRef>>(5);
+
+ /** identifier for gc ack*/
+ private UID ackID;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2013-01-16 02:31:22.368241485 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2013-01-16 02:36:17.440943411 +0000
+@@ -78,7 +78,7 @@
+ Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>());
+
+ private final UID id;
+- private List<Object> objList = new ArrayList<>(); // null if released
++ private List<Object> objList = new ArrayList<Object>(); // null if released
+ private Future<?> task = null;
+
+ /**
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2013-01-16 02:31:22.380241675 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2013-01-16 02:33:21.178134084 +0000
+@@ -176,9 +176,9 @@
+ private DGC dgc;
+
+ /** table of refs held for endpoint: maps LiveRef to RefEntry */
+- private Map<LiveRef, RefEntry> refTable = new HashMap<>(5);
++ private Map<LiveRef, RefEntry> refTable = new HashMap<LiveRef, RefEntry>(5);
+ /** set of RefEntry instances from last (failed) dirty call */
+- private Set<RefEntry> invalidRefs = new HashSet<>(5);
++ private Set<RefEntry> invalidRefs = new HashSet<RefEntry>(5);
+
+ /** true if this entry has been removed from the global table */
+ private boolean removed = false;
+@@ -200,12 +200,12 @@
+ private boolean interruptible = false;
+
+ /** reference queue for phantom references */
+- private ReferenceQueue<LiveRef> refQueue = new ReferenceQueue<>();
++ private ReferenceQueue<LiveRef> refQueue = new ReferenceQueue<LiveRef>();
+ /** set of clean calls that need to be made */
+- private Set<CleanRequest> pendingCleans = new HashSet<>(5);
++ private Set<CleanRequest> pendingCleans = new HashSet<CleanRequest>(5);
+
+ /** global endpoint table: maps Endpoint to EndpointEntry */
+- private static Map<Endpoint,EndpointEntry> endpointTable = new HashMap<>(5);
++ private static Map<Endpoint,EndpointEntry> endpointTable = new HashMap<Endpoint,EndpointEntry>(5);
+ /** handle for GC latency request (for future cancellation) */
+ private static GC.LatencyRequest gcLatencyRequest = null;
+
+@@ -282,7 +282,7 @@
+ refEntry = new RefEntry(refClone);
+ refTable.put(refClone, refEntry);
+ if (refsToDirty == null) {
+- refsToDirty = new HashSet<>(5);
++ refsToDirty = new HashSet<RefEntry>(5);
+ }
+ refsToDirty.add(refEntry);
+ }
+@@ -564,7 +564,7 @@
+ needRenewal = true;
+ if (!invalidRefs.isEmpty()) {
+ refsToDirty = invalidRefs;
+- invalidRefs = new HashSet<>(5);
++ invalidRefs = new HashSet<RefEntry>(5);
+ }
+ sequenceNum = getNextSequenceNum();
+ }
+@@ -603,12 +603,12 @@
+ if (refEntry.isRefSetEmpty()) {
+ if (refEntry.hasDirtyFailed()) {
+ if (strongCleans == null) {
+- strongCleans = new HashSet<>(5);
++ strongCleans = new HashSet<RefEntry>(5);
+ }
+ strongCleans.add(refEntry);
+ } else {
+ if (normalCleans == null) {
+- normalCleans = new HashSet<>(5);
++ normalCleans = new HashSet<RefEntry>(5);
+ }
+ normalCleans.add(refEntry);
+ }
+@@ -704,7 +704,7 @@
+ /** LiveRef value for this entry (not a registered instance) */
+ private LiveRef ref;
+ /** set of phantom references to registered instances */
+- private Set<PhantomLiveRef> refSet = new HashSet<>(5);
++ private Set<PhantomLiveRef> refSet = new HashSet<PhantomLiveRef>(5);
+ /** true if a dirty call containing this ref has failed */
+ private boolean dirtyFailed = false;
+
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2013-01-16 02:31:22.388241803 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2013-01-16 02:36:08.824806043 +0000
+@@ -84,7 +84,7 @@
+ /** remote implementation of DGC interface for this VM */
+ private static DGCImpl dgc;
+ /** table that maps VMID to LeaseInfo */
+- private Map<VMID,LeaseInfo> leaseTable = new HashMap<>();
++ private Map<VMID,LeaseInfo> leaseTable = new HashMap<VMID,LeaseInfo>();
+ /** checks for lease expiration */
+ private Future<?> checker = null;
+
+@@ -236,7 +236,7 @@
+ long time = System.currentTimeMillis();
+
+ /* List of vmids that need to be removed from the leaseTable */
+- List<LeaseInfo> toUnregister = new ArrayList<>();
++ List<LeaseInfo> toUnregister = new ArrayList<LeaseInfo>();
+
+ /* Build a list of leaseInfo objects that need to have
+ * targets removed from their notifySet. Remove expired
+@@ -313,7 +313,7 @@
+ private static class LeaseInfo {
+ VMID vmid;
+ long expiration;
+- Set<Target> notifySet = new HashSet<>();
++ Set<Target> notifySet = new HashSet<Target>();
+
+ LeaseInfo(VMID vmid, long lease) {
+ this.vmid = vmid;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2013-01-16 02:31:22.396241930 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2013-01-16 02:37:15.185864150 +0000
+@@ -62,9 +62,9 @@
+
+ /** tables mapping to Target, keyed from ObjectEndpoint and impl object */
+ private static final Map<ObjectEndpoint,Target> objTable =
+- new HashMap<>();
++ new HashMap<ObjectEndpoint,Target>();
+ private static final Map<WeakRef,Target> implTable =
+- new HashMap<>();
++ new HashMap<WeakRef,Target>();
+
+ /**
+ * lock guarding keepAliveCount, reaper, and gcLatencyRequest.
+@@ -79,7 +79,7 @@
+ private static Thread reaper = null;
+
+ /** queue notified when weak refs in the table are cleared */
+- static final ReferenceQueue<Object> reapQueue = new ReferenceQueue<>();
++ static final ReferenceQueue<Object> reapQueue = new ReferenceQueue<Object>();
+
+ /** handle for GC latency request (for future cancellation) */
+ private static GC.LatencyRequest gcLatencyRequest = null;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2013-01-16 02:31:22.404242057 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2013-01-16 02:34:03.586809842 +0000
+@@ -75,13 +75,13 @@
+
+ /** table of hosts successfully connected to and the factory used */
+ private Hashtable<String, RMISocketFactory> successTable =
+- new Hashtable<>();
++ new Hashtable<String, RMISocketFactory>();
+
+ /** maximum number of hosts to remember successful connection to */
+ private static final int MaxRememberedHosts = 64;
+
+ /** list of the hosts in successTable in initial connection order */
+- private Vector<String> hostList = new Vector<>(MaxRememberedHosts);
++ private Vector<String> hostList = new Vector<String>(MaxRememberedHosts);
+
+ /** default factory for initial use for direct socket connection */
+ protected RMISocketFactory initialFactory = new RMIDirectSocketFactory();
+@@ -96,7 +96,7 @@
+ * socket connection fails.
+ */
+ public RMIMasterSocketFactory() {
+- altFactoryList = new Vector<>(2);
++ altFactoryList = new Vector<RMISocketFactory>(2);
+ boolean setFactories = false;
+
+ try {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2013-01-16 02:31:22.412242185 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2013-01-16 02:36:35.937238312 +0000
+@@ -53,10 +53,10 @@
+ /** stub for remote object */
+ private final Remote stub;
+ /** set of clients that hold references to this target */
+- private final Vector<VMID> refSet = new Vector<>();
++ private final Vector<VMID> refSet = new Vector<VMID>();
+ /** table that maps client endpoints to sequence numbers */
+ private final Hashtable<VMID, SequenceEntry> sequenceTable =
+- new Hashtable<>(5);
++ new Hashtable<VMID, SequenceEntry>(5);
+ /** access control context in which target was created */
+ private final AccessControlContext acc;
+ /** context class loader in which target was created */
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2013-01-16 02:31:22.424242376 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2013-01-16 02:34:20.691082418 +0000
+@@ -85,7 +85,7 @@
+ private DataOutputStream dataOut;
+
+ /** table holding currently open connection IDs and related info */
+- private Hashtable<Integer, MultiplexConnectionInfo> connectionTable = new Hashtable<>(7);
++ private Hashtable<Integer, MultiplexConnectionInfo> connectionTable = new Hashtable<Integer, MultiplexConnectionInfo>(7);
+
+ /** number of currently open connections */
+ private int numConnections = 0;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2013-01-16 02:31:22.432242504 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2013-01-16 02:34:36.327331615 +0000
+@@ -64,7 +64,7 @@
+ private final TCPTransport tr;
+ /** list of cached connections */
+ private final List<TCPConnection> freeList =
+- new ArrayList<>();
++ new ArrayList<TCPConnection>();
+ /** frees cached connections that have expired (guarded by freeList) */
+ private Future<?> reaper = null;
+
+@@ -480,7 +480,7 @@
+ private TCPTransport transport;
+
+ /** queue of connections to be accepted */
+- private List<Connection> queue = new ArrayList<>();
++ private List<Connection> queue = new ArrayList<Connection>();
+
+ /** thread ID counter */
+ private static int threadNum = 0;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2013-01-16 02:31:22.440242630 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2013-01-16 02:34:52.623591345 +0000
+@@ -148,7 +148,7 @@
+ // TBD: should this be a weak hash table?
+ private static final
+ Map<TCPEndpoint,LinkedList<TCPEndpoint>> localEndpoints =
+- new HashMap<>();
++ new HashMap<TCPEndpoint,LinkedList<TCPEndpoint>>();
+
+ /**
+ * Create an endpoint for a specified host and port.
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2013-01-16 02:31:22.448242758 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2013-01-16 02:35:46.984457860 +0000
+@@ -120,7 +120,7 @@
+
+ /** client host for the current thread's connection */
+ private static final ThreadLocal<ConnectionHandler>
More information about the distro-pkg-dev
mailing list