Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 10140:5b80b4b22b4c jdk8u25-b06
Merge
author | asaha |
---|---|
date | Wed, 02 Jul 2014 15:45:25 -0700 |
parents | ebb5c84bca19 (current diff) c9e4ddfdf58b (diff) |
children | f935349e2c06 |
files | .hgtags |
diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 30 14:51:46 2014 -0700 +++ b/.hgtags Wed Jul 02 15:45:25 2014 -0700 @@ -283,6 +283,7 @@ 105753f0465e534e3664d0935016f5a0d061829d jdk8u11-b10 bd5f7651116e2634c09adf073609811c60a4d5e7 jdk8u11-b11 cbdfb9fdf1b3819f0299991a07e6ca72b3573625 jdk8u11-b12 +35329d502d6fb65e4f089fd338d4ee0757811b36 jdk8u11-b31 9543b632ab87368c887d8b29b21157ebb44228d0 jdk8u20-b02 5a9f04957f826ce23639479c9791c7d8fd282b01 jdk8u20-b03 c347889445c1153f11aaa56092d44a911e497454 jdk8u20-b04 @@ -305,6 +306,7 @@ 266302e9c31172984493404d5b223979315b59ac jdk8u20-b18 38548d32c91cfa57b1d31eec0a5e79c936e86f11 jdk8u20-b19 5c0406ee9e820140b5322db006baed199c165b4f jdk8u20-b20 +693025bbc45d683676fa78bb76201b665e0d8f2d jdk8u20-b21 abca9f6f1a10e9f91b2538bbe7870f54f550d986 jdk8u25-b00 7d0627679c9fdeaaaa9fe15c7cc11af0763621ec jdk8u25-b01 b0277ec994b751ebb761814675352506cd56bcd6 jdk8u25-b02
--- a/src/share/classes/sun/awt/shell/ShellFolder.java Mon Jun 30 14:51:46 2014 -0700 +++ b/src/share/classes/sun/awt/shell/ShellFolder.java Wed Jul 02 15:45:25 2014 -0700 @@ -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) {