--- old/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java	2020-05-20 18:03:37.346246989 -0700
+++ new/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java	2020-05-20 18:03:37.006240461 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, 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
@@ -391,9 +391,7 @@
                             return System.getProperty("os.name");
                         }
                     });
-            if ("SunOS".equals(osname)) {
-                return newInstance("jdk.net.SolarisSocketOptions");
-            } else if ("Linux".equals(osname)) {
+            if ("Linux".equals(osname)) {
                 return newInstance("jdk.net.LinuxSocketOptions");
             } else if (osname.startsWith("Mac")) {
                 return newInstance("jdk.net.MacOSXSocketOptions");