infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-27 18:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

8138881: Bug in OSInfo.java

Browse Source 
Reviewed-by: serb, alexsch
This commit is contained in:
Rajeev Chamyal 2015-11-02 17:52:40 +04:00
parent 943ce6067c
commit e0f0f10478
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/java.desktop/share/classes/sun/awt/OSInfo.java
View File

@ -71,7 +71,7 @@ public class OSInfo {
windowsVersionMap.put(WINDOWS_XP.toString(), WINDOWS_XP);
windowsVersionMap.put(WINDOWS_2003.toString(), WINDOWS_2003);
windowsVersionMap.put(WINDOWS_VISTA.toString(), WINDOWS_VISTA);
windowsVersionMap.put(WINDOWS_VISTA.toString(), WINDOWS_7);
windowsVersionMap.put(WINDOWS_7.toString(), WINDOWS_7);
}
private static final PrivilegedAction<OSType> osTypeAction = new PrivilegedAction<OSType>() {

49
jdk/test/javax/swing/LookAndFeel/8138881/TestOSVersion.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8138881
* @summary typo in OSInfo.java
* @modules java.desktop/sun.awt
* @requires (os.family == "windows")
* @run main TestOSVersion
*/
import sun.awt.OSInfo;
public class TestOSVersion {
private static final String WIN_VISTA_VERSION = "6.0";
public static void main(String[] arg) {
String oSVersion = System.getProperty("os.version");
if (WIN_VISTA_VERSION.equals(oSVersion)) {
if (OSInfo.getWindowsVersion().toString().equals("6.1") ) {
throw new RuntimeException("Incorrect Windows VISTA OS version "
+ "in OSInfo");
}
}
}
}