Mercurial > hg > release > icedtea7-forest-2.1 > jdk

changeset 4964:7750666eaf16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 05e5519ffbcc
children 0d497f17e31b
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 Jun 26 22:27:10 2013 -0500
+++ 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;