--- old/src/share/classes/sun/rmi/transport/ConnectionInputStream.java	Tue Feb 21 21:27:15 2012
+++ new/src/share/classes/sun/rmi/transport/ConnectionInputStream.java	Tue Feb 21 21:27:13 2012
@@ -43,7 +43,7 @@
     private boolean dgcAckNeeded = false;
 
     /** Hashtable mapping Endpoints to lists of LiveRefs to register */
-    private Map incomingRefTable = new HashMap(5);
+    private Map<Endpoint, List<LiveRef>> incomingRefTable = new HashMap<>(5);
 
     /** identifier for gc ack*/
     private UID ackID;
@@ -70,10 +70,10 @@
         Endpoint ep = ref.getEndpoint();
 
         // check whether endpoint is already in the hashtable
-        List refList = (List) incomingRefTable.get(ep);
+        List<LiveRef> refList = incomingRefTable.get(ep);
 
         if (refList == null) {
-            refList = new ArrayList();
+            refList = new ArrayList<LiveRef>();
             incomingRefTable.put(ep, refList);
         }
 
@@ -89,12 +89,14 @@
      */
     void registerRefs() throws IOException {
         if (!incomingRefTable.isEmpty()) {
-            Set entrySet = incomingRefTable.entrySet();
-            Iterator iter = entrySet.iterator();
+            Set<Map.Entry<Endpoint, List<LiveRef>>> entrySet =
+                    incomingRefTable.entrySet();
+            Iterator<Map.Entry<Endpoint, List<LiveRef>>> iter = 
+                    entrySet.iterator();
             while (iter.hasNext()) {
-                Map.Entry entry = (Map.Entry) iter.next();
-                Endpoint ep = (Endpoint) entry.getKey();
-                List refList = (List) entry.getValue();
+                Map.Entry<Endpoint, List<LiveRef>> entry = iter.next();
+                Endpoint ep = entry.getKey();
+                List<LiveRef> refList = entry.getValue();
                 DGCClient.registerRefs(ep, refList);
             }
         }