From d5d6252e5bb0d248471b412dd43dfebb5242b011 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Wed, 18 Jan 2012 19:09:26 +0400 Subject: [PATCH] 7130662: GTK file dialog crashes with a NPE Guard adding a back slash to the directory name with an if (!= null) check Reviewed-by: anthony, art --- .../solaris/classes/sun/awt/X11/GtkFileDialogPeer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jdk/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java b/jdk/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java index 41f5398a788..ebd434a96df 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java @@ -76,9 +76,12 @@ class GtkFileDialogPeer extends XDialogPeer implements FileDialogPeer { accessor.setFiles(fd, null, null); } else { // Fix 6987233: add the trailing slash if it's absent - accessor.setDirectory(fd, directory + - (directory.endsWith(File.separator) ? - "" : File.separator)); + String with_separator = directory; + if (directory != null) { + with_separator = directory.endsWith(File.separator) ? + directory : (directory + File.separator); + } + accessor.setDirectory(fd, with_separator); accessor.setFile(fd, filenames[0]); accessor.setFiles(fd, directory, filenames); }