--- a/src/java.base/share/classes/sun/security/ssl/TransportContext.java	Sun Jun 10 13:36:40 2018 -0700
+++ b/src/java.base/share/classes/sun/security/ssl/TransportContext.java	Sun Jun 10 21:22:05 2018 -0700
@@ -86,6 +86,7 @@
 
     // Please never use the transport parameter other than storing a
     // reference to this object.
+    //
     // Called by SSLEngineImpl
     TransportContext(SSLContextImpl sslContext, SSLTransport transport,
             InputRecord inputRecord, OutputRecord outputRecord) {
@@ -95,17 +96,19 @@
 
     // Please never use the transport parameter other than storing a
     // reference to this object.
+    //
     // Called by SSLSocketImpl
     TransportContext(SSLContextImpl sslContext, SSLTransport transport,
             InputRecord inputRecord, OutputRecord outputRecord,
             boolean isClientMode) {
         this(sslContext, transport,
                 new SSLConfiguration(sslContext, isClientMode),
-                inputRecord, outputRecord,false);
+                inputRecord, outputRecord, false);
     }
 
     // Please never use the transport parameter other than storing a
     // reference to this object.
+    //
     // Called by SSLSocketImpl with an existing SSLConfig
     TransportContext(SSLContextImpl sslContext, SSLTransport transport,
             SSLConfiguration sslConfig,
@@ -636,9 +639,9 @@
     // A separate thread is allocated to deliver handshake completion
     // events.
     private static class NotifyHandshake implements Runnable {
-        private Set<Map.Entry<HandshakeCompletedListener,
+        private final Set<Map.Entry<HandshakeCompletedListener,
                 AccessControlContext>> targets;         // who gets notified
-        private HandshakeCompletedEvent event;          // the notification
+        private final HandshakeCompletedEvent event;    // the notification
 
         NotifyHandshake(
                 Map<HandshakeCompletedListener,AccessControlContext> listeners,