From 8cccc8f99a00139b921f15453c4a27f714c288b2 Mon Sep 17 00:00:00 2001 From: Kurchi Subhra Hazra Date: Wed, 6 Jun 2012 11:37:08 -0700 Subject: [PATCH] 7173645: (props) System.getProperty("os.name") should return "Windows Server 2012" for Windows Server 2012 Enable Windows Server 2012 to be recognized as "os.name" Reviewed-by: alanb, dholmes, chegar --- jdk/src/windows/native/java/lang/java_props_md.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jdk/src/windows/native/java/lang/java_props_md.c b/jdk/src/windows/native/java/lang/java_props_md.c index 0e71e344453..19cac3327e9 100644 --- a/jdk/src/windows/native/java/lang/java_props_md.c +++ b/jdk/src/windows/native/java/lang/java_props_md.c @@ -404,6 +404,7 @@ GetJavaProperties(JNIEnv* env) * 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. @@ -467,6 +468,7 @@ GetJavaProperties(JNIEnv* env) 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)"; } }