Changeset 159


Ignore:
Timestamp:
Sep 21, 2010, 11:38:57 PM (10 years ago)
Author:
dmik
Message:

jdk: Make sure we don't attempt to use the missing modern dual Windows IP stack on OS/2.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/jdk/src/windows/classes/java/net/PlainSocketImpl.java

    r2 r159  
    4646    private AbstractPlainSocketImpl impl;
    4747
    48     /* the windows version. */
     48    /* the OS name (OS/2 or windows). */
     49    private static String osName;
     50
     51    /* the OS version. */
    4952    private static float version;
    5053
     
    6063                    version = 0;
    6164                    try {
     65                        osName = System.getProperties().getProperty("os.name");
    6266                        version = Float.parseFloat(System.getProperties().getProperty("os.version"));
    6367                        preferIPv4Stack = Boolean.parseBoolean(
     
    6973                } });
    7074
    71         // (version >= 6.0) implies Vista or greater.
    72         if (version >= 6.0 && !preferIPv4Stack) {
    73             useDualStackImpl = true;
     75        if (!osName.equals("OS/2")) {
     76            // (version >= 6.0) implies Vista or greater.
     77            if (version >= 6.0 && !preferIPv4Stack) {
     78                useDualStackImpl = true;
     79            }
    7480        }
    7581    }
Note: See TracChangeset for help on using the changeset viewer.