# HG changeset patch # User simonis # Date 1438022375 -7200 # Mon Jul 27 20:39:35 2015 +0200 # Node ID e74eeac3a111bdc7aa7aeadce1b58771b8a75e77 # Parent 64b2be1b304c96b6b67e69d65b0cfd02b3039009 8132408: Check os.name before os.version in SunGraphicsEnvironment constructor diff --git a/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java b/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java --- a/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java +++ b/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java @@ -84,6 +84,8 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { public Object run() { + String osName = System.getProperty("os.name"); + if ("SunOS".equals(osName)) { String version = System.getProperty("os.version", "0.0"); try { float ver = Float.parseFloat(version); @@ -117,7 +119,7 @@ } } catch (Exception e) { } - + } /* Establish the default font to be used by SG2D etc */ defaultFont = new Font(Font.DIALOG, Font.PLAIN, 12);