commit fcd5e6c4046ccc280d13fd5453e3c8a6723fd16c
author Kurchi Subhra Hazra <khazra@openjdk.org> Wed Mar 20 11:50:11 2013 -0700
committer Kurchi Subhra Hazra <khazra@openjdk.org> Wed Mar 20 11:50:11 2013 -0700
tree 52dbb1bb8f609f402e0987894f65996dda24a466
parent e97bdfa854f1dc3b7d5d6bc04ab06f6ee7f39c7e

8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build

Eliminate fall-through while setting socket options on Windows

Reviewed-by: alanb, chegar

jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java

diff --git a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
index 6163dd3..aef92a2 100644
--- a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
+++ b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
@@ -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;