Changeset 159

Timestamp:

Sep 22, 2010, 1:38:57 AM (15 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:

• trunk/openjdk/jdk/src/windows/classes/java/net/PlainSocketImpl.java (modified) (3 diffs)

trunk/openjdk/jdk/src/windows/classes/java/net/PlainSocketImpl.java

@@ -46 +46 @@
     private AbstractPlainSocketImpl impl;
 
-    /* the windows version. */
+    /* the OS name (OS/2 or windows). */
+    private static String osName;
+
+    /* the OS version. */
     private static float version;
 
@@ -60 +63 @@
                     version = 0;
                     try {
+                        osName = System.getProperties().getProperty("os.name");
                         version = Float.parseFloat(System.getProperties().getProperty("os.version"));
                         preferIPv4Stack = Boolean.parseBoolean(
@@ -69 +73 @@
                 } });
 
-        // (version >= 6.0) implies Vista or greater.
-        if (version >= 6.0 && !preferIPv4Stack) {
-            useDualStackImpl = true;
+        if (!osName.equals("OS/2")) {
+            // (version >= 6.0) implies Vista or greater.
+            if (version >= 6.0 && !preferIPv4Stack) {
+                useDualStackImpl = true;
+            }
         }
     }