--- a/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java	Sun Dec 03 01:47:23 2017 -0800
+++ b/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java	Mon Dec 04 13:24:00 2017 +0530
@@ -45,41 +45,33 @@
             ExtendedSocketOptions.getInstance();
 
     protected <T> void setOption(SocketOption<T> name, T value) throws IOException {
-        if (!extendedOptions.isOptionSupported(name)) {
-            if (!name.equals(StandardSocketOptions.SO_REUSEPORT)) {
-                super.setOption(name, value);
+        if (isClosed()) {
+            throw new SocketException("Socket closed");
+        }
+        if (supportedOptions().contains(name)) {
+            if (extendedOptions.isOptionSupported(name)) {
+                extendedOptions.setOption(fd, name, value);
             } else {
-               if (supportedOptions().contains(name)) {
-                   super.setOption(name, value);
-               } else {
-                   throw new UnsupportedOperationException("unsupported option");
-               }
+                super.setOption(name, value);
             }
         } else {
-            if (isClosed()) {
-                throw new SocketException("Socket closed");
-            }
-            extendedOptions.setOption(fd, name, value);
+            throw new UnsupportedOperationException("unsupported option");
         }
     }
 
     @SuppressWarnings("unchecked")
     protected <T> T getOption(SocketOption<T> name) throws IOException {
-        if (!extendedOptions.isOptionSupported(name)) {
-            if (!name.equals(StandardSocketOptions.SO_REUSEPORT)) {
-                return super.getOption(name);
+        if (isClosed()) {
+            throw new SocketException("Socket closed");
+        }
+        if (supportedOptions().contains(name)) {
+            if (extendedOptions.isOptionSupported(name)) {
+                return (T) extendedOptions.getOption(fd, name);
             } else {
-                if (supportedOptions().contains(name)) {
-                    return super.getOption(name);
-                } else {
-                    throw new UnsupportedOperationException("unsupported option");
-                }
+                return super.getOption(name);
             }
         } else {
-            if (isClosed()) {
-                throw new SocketException("Socket closed");
-            }
-            return (T) extendedOptions.getOption(fd, name);
+            throw new UnsupportedOperationException("unsupported option");
         }
     }
 

--- a/src/java.base/unix/classes/java/net/PlainSocketImpl.java	Sun Dec 03 01:47:23 2017 -0800
+++ b/src/java.base/unix/classes/java/net/PlainSocketImpl.java	Mon Dec 04 13:24:00 2017 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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
@@ -58,58 +58,57 @@
             ExtendedSocketOptions.getInstance();
 
     protected <T> void setOption(SocketOption<T> name, T value) throws IOException {
-        if (!extendedOptions.isOptionSupported(name)) {
-            if (!name.equals(StandardSocketOptions.SO_REUSEPORT)) {
-                super.setOption(name, value);
+        if (isClosedOrPending()) {
+            throw new SocketException("Socket closed");
+        }
+        if (supportedOptions().contains(name)) {
+            if (extendedOptions.isOptionSupported(name)) {
+                extendedOptions.setOption(fd, name, value);
             } else {
-                if (supportedOptions().contains(name)) {
-                    super.setOption(name, value);
-                } else {
-                    throw new UnsupportedOperationException("unsupported option");
-                }
+                super.setOption(name, value);
             }
         } else {
-            if (getSocket() == null) {
-                throw new UnsupportedOperationException("unsupported option");
-            }
-            if (isClosedOrPending()) {
-                throw new SocketException("Socket closed");
-            }
-            extendedOptions.setOption(fd, name, value);
+            throw new UnsupportedOperationException("unsupported option");
         }
     }
 
     @SuppressWarnings("unchecked")
     protected <T> T getOption(SocketOption<T> name) throws IOException {
-        if (!extendedOptions.isOptionSupported(name)) {
-            if (!name.equals(StandardSocketOptions.SO_REUSEPORT)) {
-                return super.getOption(name);
+        if (isClosedOrPending()) {
+            throw new SocketException("Socket closed");
+        }
+        if (supportedOptions().contains(name)) {
+            if (extendedOptions.isOptionSupported(name)) {
+                return (T) extendedOptions.getOption(fd, name);
             } else {
-                if (supportedOptions().contains(name)) {
-                    return super.getOption(name);
-                } else {
-                    throw new UnsupportedOperationException("unsupported option");
-                }
+                return super.getOption(name);
             }
         } else {
-            if (getSocket() == null) {
-                throw new UnsupportedOperationException("unsupported option");
-            }
-            if (isClosedOrPending()) {
-                throw new SocketException("Socket closed");
-            }
-            return (T) extendedOptions.getOption(fd, name);
+            throw new UnsupportedOperationException("unsupported option");
         }
     }
 
     protected Set<SocketOption<?>> supportedOptions() {
         HashSet<SocketOption<?>> options = new HashSet<>(super.supportedOptions());
-        if (getSocket() != null) {
-            options.addAll(extendedOptions.options());
-        }
+        addExtSocketOptions(extendedOptions.options(), options);
         return options;
     }
 
+    private void addExtSocketOptions(Set<SocketOption<?>> extOptions,
+            Set<SocketOption<?>> options) {
+        extOptions.forEach((option) -> {
+            if (option.name().equals("SO_FLOW_SLA")) {
+                // SO_FLOW_SLA is Solaris specific option which is not applicable
+                // for ServerSockets.
+                // getSocket() will always return null for server socket
+                if (getSocket() != null) {
+                    options.add(option);
+                }
+            } else {
+                options.add(option);
+            }
+        });
+    }
     protected void socketSetOption(int opt, boolean b, Object val) throws SocketException {
         if (opt == SocketOptions.SO_REUSEPORT &&
             !supportedOptions().contains(StandardSocketOptions.SO_REUSEPORT)) {

--- a/test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java	Sun Dec 03 01:47:23 2017 -0800
+++ b/test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java	Mon Dec 04 13:24:00 2017 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -57,6 +57,8 @@
             Class<?> c = Class.forName("jdk.net.ExtendedSocketOptions");
             Field field = c.getField("SO_FLOW_SLA");
             socketOptions.add((SocketOption<?>)field.get(null));
+            field = c.getField("TCP_QUICKACK");
+            socketOptions.add((SocketOption<?>)field.get(null));
         } catch (ClassNotFoundException e) {
             // ignore, jdk.net module not present
         } catch (ReflectiveOperationException e) {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/net/Sockets/ExtOptionTest.java	Mon Dec 04 13:24:00 2017 +0530
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /*
+ * @test
+ * @bug 8190843
+ * @summary can not set/get extendedOptions to ServerSocket
+ * @modules jdk.net
+ * @run main ExtOptionTest
+ */
+import java.io.IOException;
+import java.net.ServerSocket;
+
+import static jdk.net.ExtendedSocketOptions.TCP_QUICKACK;
+import static jdk.net.ExtendedSocketOptions.SO_FLOW_SLA;
+
+public class ExtOptionTest {
+
+    private static final String OS = "Linux";
+
+    public static void main(String args[]) throws IOException {
+        var operSys = System.getProperty("os.name");
+        try (ServerSocket ss = new ServerSocket(0)) {
+            // currently TCP_QUICKACK is available only on Linux.
+            if (operSys.equals(OS)) {
+                ss.setOption(TCP_QUICKACK, true);
+                if (!ss.getOption(TCP_QUICKACK)) {
+                    throw new RuntimeException("Test failed, TCP_QUICKACK should"
+                            + " have been set");
+                }
+            } else if (operSys.equals("SunOS")) {
+                if (ss.supportedOptions().contains(SO_FLOW_SLA)) {
+                    throw new RuntimeException("Test failed, SO_FLOW_SLA is not "
+                            + "applicable for ServerSocket");
+                }
+            } else {
+                if (ss.supportedOptions().contains(TCP_QUICKACK)) {
+                    ss.setOption(TCP_QUICKACK, true);
+                    if (!ss.getOption(TCP_QUICKACK)) {
+                        throw new RuntimeException("Test failed, TCP_QUICKACK should"
+                                + " have been set");
+                    }
+                }
+            }
+        }
+    }
+}