changeset 824:be2b6b030a79

6560349: REGRESSION :folder having ".lnk" in the name can not be opened by 5.0 and later versions Reviewed-by: alexp
author rupashka
date Wed, 26 Nov 2008 19:08:41 +0300
parents 63e684c4ed2f
children 8b842701af50
files src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
diffstat 1 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Tue Nov 25 16:42:10 2008 +0300
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java	Wed Nov 26 19:08:41 2008 +0300
@@ -1134,11 +1134,16 @@
         // Traverse shortcuts on Windows
         if (dir != null && FilePane.usesShellFolder(fc)) {
             try {
-                File linkedTo = ShellFolder.getShellFolder(dir).getLinkLocation();
-                if (linkedTo != null && fc.isTraversable(linkedTo)) {
-                    dir = linkedTo;
-                } else {
-                    return;
+                ShellFolder shellFolder = ShellFolder.getShellFolder(dir);
+
+                if (shellFolder.isLink()) {
+                    File linkedTo = shellFolder.getLinkLocation();
+
+                    if (linkedTo != null && fc.isTraversable(linkedTo)) {
+                        dir = linkedTo;
+                    } else {
+                        return;
+                    }
                 }
             } catch (FileNotFoundException ex) {
                 return;