Mercurial > hg > openjdk > jdk8u > jdk
changeset 9744:693025bbc45d jdk8u20-b21
8042094: Test javax/swing/JFileChooser/7036025/bug7036025.java fails with java.lang.NullPointerException on Windows x86
Reviewed-by: ahgross, art, pchelko, mschoene
author | azvegint |
---|---|
date | Thu, 26 Jun 2014 14:28:05 +0400 |
parents | e6ed015afbbf |
children | 0c2393744b29 69f4c318a582 |
files | src/share/classes/sun/awt/shell/ShellFolder.java |
diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/awt/shell/ShellFolder.java Wed Jun 25 12:55:32 2014 -0700 +++ b/src/share/classes/sun/awt/shell/ShellFolder.java Thu Jun 26 14:28:05 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -33,8 +33,6 @@ import java.util.*; import java.util.concurrent.Callable; -import sun.reflect.misc.ReflectUtil; - /** * @author Michael Martak * @since 1.4 @@ -201,16 +199,19 @@ // Static - private static ShellFolderManager shellFolderManager; + private static final ShellFolderManager shellFolderManager; - private static Invoker invoker; + private static final Invoker invoker; static { String managerClassName = (String)Toolkit.getDefaultToolkit(). getDesktopProperty("Shell.shellFolderManager"); Class managerClass = null; try { - managerClass = ReflectUtil.forName(managerClassName); + managerClass = Class.forName(managerClassName, false, null); + if (!ShellFolderManager.class.isAssignableFrom(managerClass)) { + managerClass = null; + } // swallow the exceptions below and use default shell folder } catch(ClassNotFoundException e) { } catch(NullPointerException e) {