stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8042094: Test javax/swing/JFileChooser/7036025/bug7036025.java fails with java.lang.NullPointerException on Windows x86

Browse Source 
Reviewed-by: ahgross, art, pchelko, mschoene
This commit is contained in:
Alexander Zvegintsev 2014-06-24 10:36:35 +04:00
parent fee9c1b0cc
commit fca14b0d55
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/share/classes/sun/awt/shell/ShellFolder.java
View File

@ -33,8 +33,6 @@ import java.io.FileNotFoundException;
import java.util.*;
import java.util.concurrent.Callable;
import sun.reflect.misc.ReflectUtil;
/**
* @author Michael Martak
* @since 1.4
@ -201,16 +199,19 @@ public abstract class ShellFolder extends File {
// 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) {

2
jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
View File

@ -51,7 +51,7 @@ import sun.awt.util.ThreadGroupUtils;
* @since 1.4
*/
public class Win32ShellFolderManager2 extends ShellFolderManager {
final class Win32ShellFolderManager2 extends ShellFolderManager {
static {
// Load library here