--- a/jdk/src/java.base/share/classes/java/net/DatagramSocket.java	Thu Jun 04 10:27:06 2015 +0100
+++ b/jdk/src/java.base/share/classes/java/net/DatagramSocket.java	Thu Jun 04 18:16:25 2015 +0100
@@ -1184,7 +1184,14 @@
 
         if (isClosed())
             throw new SocketException("Socket is closed");
-        getImpl().setOption(SocketOptions.IP_TOS, tc);
+        try {
+            getImpl().setOption(SocketOptions.IP_TOS, tc);
+        } catch (SocketException se) {
+            // not supported if socket already connected
+            // Solaris returns error in such cases
+            if(!isConnected())
+                throw se;
+        }
     }
 
     /**