From fcd5e6c4046ccc280d13fd5453e3c8a6723fd16c Mon Sep 17 00:00:00 2001 From: Kurchi Subhra Hazra Date: Wed, 20 Mar 2013 11:50:11 -0700 Subject: [PATCH] 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 --- .../windows/classes/java/net/DualStackPlainSocketImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java index 6163dd32d42..aef92a2c287 100644 --- a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java +++ b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java @@ -185,14 +185,15 @@ class DualStackPlainSocketImpl extends AbstractPlainSocketImpl 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;