Mercurial > hg > release > icedtea7-forest-2.2 > jdk
changeset 5392:ad785fb5f898
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
author | khazra |
---|---|
date | Wed, 20 Mar 2013 13:39:56 -0700 |
parents | 1d48c0d0a0a2 |
children | 1112bf018977 |
files | src/windows/classes/java/net/DualStackPlainSocketImpl.java |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/classes/java/net/DualStackPlainSocketImpl.java Wed Apr 10 14:28:10 2013 +0400 +++ b/src/windows/classes/java/net/DualStackPlainSocketImpl.java Wed Mar 20 13:39:56 2013 -0700 @@ -184,14 +184,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;