--- a/src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java	Mon Jun 25 21:22:16 2018 +0300
+++ b/src/java.base/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java	Mon Jun 25 13:41:39 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
-
 import javax.net.ssl.SSLServerSocketFactory;
 
 /**
@@ -36,11 +35,9 @@
  *
  * @author David Brownell
  */
-final
-public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory
-{
+public final class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
     private static final int DEFAULT_BACKLOG = 50;
-    private SSLContextImpl context;
+    private final SSLContextImpl context;
 
 
     /**
@@ -55,8 +52,7 @@
     /**
      * Called from SSLContextImpl's getSSLServerSocketFactory().
      */
-    SSLServerSocketFactoryImpl (SSLContextImpl context)
-    {
+    SSLServerSocketFactoryImpl(SSLContextImpl context) {
         this.context = context;
     }
 
@@ -73,26 +69,22 @@
     }
 
     @Override
-    public ServerSocket createServerSocket (int port)
-    throws IOException
-    {
-        return new SSLServerSocketImpl (port, DEFAULT_BACKLOG, context);
+    public ServerSocket createServerSocket(int port) throws IOException {
+        return new SSLServerSocketImpl(context, port, DEFAULT_BACKLOG);
     }
 
 
     @Override
-    public ServerSocket createServerSocket (int port, int backlog)
-    throws IOException
-    {
-        return new SSLServerSocketImpl (port, backlog, context);
+    public ServerSocket createServerSocket (
+            int port, int backlog) throws IOException {
+        return new SSLServerSocketImpl(context, port, backlog);
     }
 
     @Override
     public ServerSocket
-    createServerSocket (int port, int backlog, InetAddress ifAddress)
-    throws IOException
-    {
-        return new SSLServerSocketImpl (port, backlog, ifAddress, context);
+    createServerSocket (int port,
+            int backlog, InetAddress ifAddress) throws IOException {
+        return new SSLServerSocketImpl(context, port, backlog, ifAddress);
     }
 
     /**
@@ -104,7 +96,7 @@
      */
     @Override
     public String[] getDefaultCipherSuites() {
-        return context.getDefaultCipherSuiteList(true).toStringArray();
+        return CipherSuite.namesOf(context.getDefaultCipherSuites(true));
     }
 
     /**
@@ -119,7 +111,6 @@
      */
     @Override
     public String[] getSupportedCipherSuites() {
-        return context.getSupportedCipherSuiteList().toStringArray();
+        return CipherSuite.namesOf(context.getSupportedCipherSuites());
     }
-
 }