8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
authorkhazra
Wed, 20 Mar 2013 11:50:11 -0700
changeset 18201 f0c28a4c1ab2
parent 18200 7b3ae6f27043
child 18202 e9a6d59491ab
8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build Summary: Eliminate fall-through while setting socket options on Windows Reviewed-by: alanb, chegar
jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
--- a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java	Wed Mar 20 10:12:37 2013 -0700
+++ b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java	Wed Mar 20 11:50:11 2013 -0700
@@ -185,14 +185,15 @@
         int optionValue = 0;
 
         switch(opt) {
-            case TCP_NODELAY :
-            case SO_OOBINLINE :
             case SO_REUSEADDR :
                 if (exclusiveBind) {
                     // SO_REUSEADDR emulated when using exclusive bind
                     isReuseAddress = on;
                     return;
                 }
+                // intentional fallthrough
+            case TCP_NODELAY :
+            case SO_OOBINLINE :
             case SO_KEEPALIVE :
                 optionValue = on ? 1 : 0;
                 break;