Mercurial > hg > openjdk > jdk8 > jdk
changeset 9099:eef10feca8ca
Merge
author | lana |
---|---|
date | Thu, 06 Feb 2014 13:28:20 -0800 |
parents | 3c9473004f38 (current diff) ab6e7bb8ff9f (diff) |
children | 80568a19aab7 |
files | |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/classes/apple/laf/JRSUIUtils.java Sat Feb 01 18:21:25 2014 -0800 +++ b/src/macosx/classes/apple/laf/JRSUIUtils.java Thu Feb 06 13:28:20 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -28,6 +28,9 @@ import com.apple.laf.AquaImageFactory.NineSliceMetrics; import apple.laf.JRSUIConstants.*; +import sun.security.action.GetPropertyAction; + +import java.security.AccessController; public class JRSUIUtils { static boolean isLeopard = isMacOSXLeopard(); @@ -47,7 +50,7 @@ static boolean currentMacOSXVersionMatchesGivenVersionRange(final int version, final boolean inclusive, final boolean matchBelow, final boolean matchAbove) { // split the "10.x.y" version number - String osVersion = System.getProperty("os.version"); + String osVersion = AccessController.doPrivileged(new GetPropertyAction("os.version")); String[] fragments = osVersion.split("\\."); // sanity check the "10." part of the version