aboutsummaryrefslogtreecommitdiff
path: root/src/share/classes/javax
diff options
context:
space:
mode:
authorrobm <none@none>2014-07-17 18:05:58 +0100
committerrobm <none@none>2014-07-17 18:05:58 +0100
commit24f2dc8fa2121cf211e4e26e1f56c928322f773f (patch)
tree0fd55b96942d23e804c9c2fd505b38f6a7b33717 /src/share/classes/javax
parentddac2db224a9e51a39e146753f2afc6706fc0c9e (diff)
parentb4d3f6ca8053b68fc41e5bf8c2592eb833226f10 (diff)
Merge
Diffstat (limited to 'src/share/classes/javax')
-rw-r--r--src/share/classes/javax/swing/filechooser/FileSystemView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/share/classes/javax/swing/filechooser/FileSystemView.java b/src/share/classes/javax/swing/filechooser/FileSystemView.java
index f62d69c0e..b1d9d1fcd 100644
--- a/src/share/classes/javax/swing/filechooser/FileSystemView.java
+++ b/src/share/classes/javax/swing/filechooser/FileSystemView.java
@@ -718,7 +718,8 @@ class WindowsFileSystemView extends FileSystemView {
* @return the Desktop folder.
*/
public File getHomeDirectory() {
- return getRoots()[0];
+ File[] roots = getRoots();
+ return (roots.length == 0) ? null : roots[0];
}
/**