diff -r cd6a440ddfcb -r 971f46db533d jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	Wed Oct 17 13:22:39 2012 -0700
+++ b/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	Thu Oct 18 01:14:00 2012 -0700
@@ -256,13 +256,9 @@
     }
 
     // add server_name extension
-    void addServerNameIndicationExtension(String hostname) {
-        // We would have checked that the hostname ia a FQDN.
-        ArrayList<String> hostnames = new ArrayList<>(1);
-        hostnames.add(hostname);
-
+    void addSNIExtension(List<SNIServerName> serverNames) {
         try {
-            extensions.add(new ServerNameExtension(hostnames));
+            extensions.add(new ServerNameExtension(serverNames));
         } catch (IOException ioe) {
             // ignore the exception and return
         }