stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: alexsch, azvegint
This commit is contained in:
Petr Pchelko 2014-07-11 18:46:47 +04:00
parent df27040934
commit 93f94161b3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
View File

@ -544,9 +544,9 @@ public final class LWCToolkit extends LWToolkit {
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);
}
@ -908,6 +908,9 @@ public final class LWCToolkit extends LWToolkit {
}
private static boolean isValidPath(String path) {
return !path.isEmpty() && !path.endsWith("/") && !path.endsWith(".");
return path != null &&
!path.isEmpty() &&
!path.endsWith("/") &&
!path.endsWith(".");
}
}