--- old/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java	Sun Dec  6 12:22:03 2015
+++ new/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java	Sun Dec  6 12:22:02 2015
@@ -2131,6 +2131,10 @@
         this.host = host;
         this.serverNames =
             Utilities.addToSNIServerNameList(this.serverNames, this.host);
+
+        if (!roleIsServer && (handshaker != null) && !handshaker.started()) {
+            handshaker.setSNIServerNames(serverNames);
+        }
     }
 
     /**