Mercurial > hg > openjdk > icedtea > jdk7 > jdk

changeset 5438:0b3ef2875441

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7173645: (props) System.getProperty("os.name") should return "Windows Server 2012" for Windows Server 2012 Summary: Enable Windows Server 2012 to be recognized as "os.name" Reviewed-by: alanb, dholmes, chegar
author khazra
date Mon, 25 Jun 2012 11:19:44 -0700
parents 4dc7cefb76b4
children 25cc059a8e38
files src/windows/native/java/lang/java_props_md.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/java/lang/java_props_md.c	Mon Jun 25 16:41:15 2012 +0100
+++ b/src/windows/native/java/lang/java_props_md.c	Mon Jun 25 11:19:44 2012 -0700
@@ -390,6 +390,7 @@
          * Windows 7                    6               1  (VER_NT_WORKSTATION)
          * Windows Server 2008 R2       6               1  (!VER_NT_WORKSTATION)
          * Windows 8                    6               2  (VER_NT_WORKSTATION)
+         * Windows Server 2012          6               2  (!VER_NT_WORKSTATION)
          *
          * This mapping will presumably be augmented as new Windows
          * versions are released.
@@ -453,6 +454,7 @@
                     switch (ver.dwMinorVersion) {
                     case  0: sprops.os_name = "Windows Server 2008";    break;
                     case  1: sprops.os_name = "Windows Server 2008 R2"; break;
+                    case  2: sprops.os_name = "Windows Server 2012";    break;
                     default: sprops.os_name = "Windows NT (unknown)";
                     }
                 }