commit d7df08177477b9e7b2093a924b63e084fdcd2ddb
author Petr Pchelko <pchelko@openjdk.org> Fri Jul 11 18:46:47 2014 +0400
committer Petr Pchelko <pchelko@openjdk.org> Fri Jul 11 18:46:47 2014 +0400
tree 8aca6e87b12e3b6f9cb0cb09afe4090ed9722200
parent e68f1080976735a8f1453a26fae13f7b4ebe23ce

8049996: [macosx] test java/awt/image/ImageIconHang.java fails with NPE

Reviewed-by: alexsch, azvegint

jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index e0e07f0..86b65a0 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -538,9 +538,9 @@
             return super.getImage(filename);
         }
 
-        String fileneame2x = getScaledImageName(filename);
-        return (imageExists(fileneame2x))
-                ? getImageWithResolutionVariant(filename, fileneame2x)
+        String filename2x = getScaledImageName(filename);
+        return (imageExists(filename2x))
+                ? getImageWithResolutionVariant(filename, filename2x)
                 : super.getImage(filename);
     }
 
@@ -891,6 +891,9 @@
     }
 
     private static boolean isValidPath(String path) {
-        return !path.isEmpty() && !path.endsWith("/") && !path.endsWith(".");
+        return path != null &&
+                !path.isEmpty() &&
+                !path.endsWith("/") &&
+                !path.endsWith(".");
     }
 }