diff -r ecad2d59bc19 -r 25bf8153fbfe jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java	Mon Apr 28 11:03:52 2014 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java	Mon Apr 28 19:05:49 2014 -0700
@@ -146,9 +146,9 @@
         savedDir = target.getDirectory();
         // Shouldn't save 'user.dir' to 'savedDir'
         // since getDirectory() will be incorrect after handleCancel
-        userDir = (String)AccessController.doPrivileged(
-            new PrivilegedAction() {
-                public Object run() {
+        userDir = AccessController.doPrivileged(
+            new PrivilegedAction<String>() {
+                public String run() {
                     return System.getProperty("user.dir");
                 }
             });