RFR: 8293862: javax/swing/JFileChooser/8046391/bug8046391.java failed with 'Cannot invoke "java.awt.Image.getWidth(java.awt.image.ImageObserver)" because "retVal" is null' [v3]

[Alexey Ivanov]

On Tue, 20 Dec 2022 08:18:11 GMT, Tejesh R <tr at openjdk.org> wrote:

>> Observation found when JFileChooser is instantiated in WindowsLookAndFeel which invokes getSystemIcon() from WindowsFileChooserUI class. Could not find the exact root cause so predicting it to be an issue with icons not loaded where resolutionVariants map is empty in _public Image getResolutionVariant(double width, double height) _. Hence proposing a null check before accessing getWidth(). Fix is tested in CI system.
>
> Tejesh R has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Updated based on review comments

Approved provided the message for MRII(int, Image) is updated.

src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java line 1408:

> 1406: 
> 1407:         public MultiResolutionIconImage(int baseSize, Image image) {
> 1408:             assert image != null : "Null icons are added into MRI variants map";

Suggestion:

            assert image != null : "Null icon passed as the base image for MRI";

-------------

Marked as reviewed by aivanov (Reviewer).

PR: https://git.openjdk.org/jdk/pull/11104