src/share/classes/sun/rmi/transport/tcp/TCPTransport.java

@@ -117,21 +117,21 @@
     /** total connections handled */
     private static final AtomicInteger connectionCount = new AtomicInteger(0);
 
     /** client host for the current thread's connection */
     private static final ThreadLocal<ConnectionHandler>
-        threadConnectionHandler = new ThreadLocal<ConnectionHandler>();
+        threadConnectionHandler = new ThreadLocal<>();
 
     /** endpoints for this transport */
     private final LinkedList<TCPEndpoint> epList;
     /** number of objects exported on this transport */
     private int exportCount = 0;
     /** server socket for this transport */
     private ServerSocket server = null;
     /** table mapping endpoints to channels */
     private final Map<TCPEndpoint,Reference<TCPChannel>> channelTable =
-        new WeakHashMap<TCPEndpoint,Reference<TCPChannel>>();
+        new WeakHashMap<>();
 
     static final RMISocketFactory defaultSocketFactory =
         RMISocketFactory.getDefaultSocketFactory();
 
     /** number of milliseconds in accepted-connection timeout.

@@ -547,12 +547,11 @@
                 }
 
                 switch (op) {
                 case TransportConstants.Call:
                     // service incoming RMI call
-                    RemoteCall call = new StreamRemoteCall(conn);
-                    if (serviceCall(call) == false)
+                    if (serviceCall(new StreamRemoteCall(conn)) == false)
                         return;
                     break;
 
                 case TransportConstants.Ping:
                     // send ack for ping