8357598: Toolkit.removeAWTEventListener should handle null listener in AWTEventListenerProxy #25401

mrserb · 2025-05-22T21:21:30Z

The issue was found here: #24692 (comment)

AWTEventListener and AWTEventListenerProxy are public classes and there's no assertion that EventListenerProxy.getListener() will always return a non-null value. So removeAWTEventListener method should fetch the listener from the proxy and check it for null similar to how it is implemented in addAWTEventListener. Currently, it works fine because we never insert null values into the map. So it is just a code clarification.

One of the test is updated just to touch that codepath.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8357598: Toolkit.removeAWTEventListener should handle null listener in AWTEventListenerProxy (Bug - P4)

Reviewers

Alexey Ivanov (@aivanov-jdk - Reviewer)
Damon Nguyen (@DamonGuy - Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25401/head:pull/25401
$ git checkout pull/25401

Update a local copy of the PR:
$ git checkout pull/25401
$ git pull https://git.openjdk.org/jdk.git pull/25401/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25401

View PR using the GUI difftool:
$ git pr show -t 25401

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25401.diff

Using Webrev

Link to Webrev Comment

…n AWTEventListenerProxy

bridgekeeper · 2025-05-22T21:21:57Z

👋 Welcome back serb! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2025-05-22T21:22:14Z

@mrserb This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8357598: Toolkit.removeAWTEventListener should handle null listener in AWTEventListenerProxy

Reviewed-by: aivanov, dnguyen

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 104 new commits pushed to the master branch:

a0eb190: 8358104: Fix ZGC compilation error on GCC 10.2
566e3b2: 8357253: Test test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java writes in src dir
e33eeee: 8341311: [Accessibility,macOS,VoiceOver] VoiceOver announces incorrect number of items in submenu of JPopupMenu
... and 101 more: https://git.openjdk.org/jdk/compare/66747710a49ea6a78aee94d3a3ec6a24b7cc36e5...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2025-05-22T21:22:41Z

@mrserb The following labels will be automatically applied to this pull request:

client
i18n

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mrserb · 2025-05-25T07:51:05Z

test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java

-                System.out.println("Do not test for XAWT Toolkit.");
-                System.out.println("Passing automatically.");
-                return;
-            }



I do not know why it was disabled on XToolkit, seems to work fine.

mlbridge · 2025-05-25T07:55:38Z

Webrevs

01: Full - Incremental (afb10b6d)
00: Full (36560145)

aivanov-jdk

Looks good.

I'll submit a test job.

test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java

…stenerProxyTest.java Co-authored-by: Alexey Ivanov <[email protected]>

DamonGuy

LGTM. Ran a test job myself and everything looks good.

TejeshR13 · 2025-05-30T09:38:04Z

test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java

+    private static void verify(Toolkit tk, int expected) {
+        AWTEventListener[] array = tk.getAWTEventListeners();
+        if (array == null || array.length != expected) {
+            System.out.println("[Simple test failed!!]");


I don't think this print statement is required?

Probably not, but it follows the common pattern in the test.

TejeshR13 · 2025-05-30T09:52:21Z

test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java

@@ -23,7 +23,7 @@

 /*


Suggested change

/*

/*

* @test

* @bug 4290704 8357598

* @summary Test use of AWTEventListenerProxyTest class

*/

Most of the test follow this pattern for jtreg tags. It would be good if you use it too for code consistency.

Not required, but can be updated…

mrserb · 2025-05-31T07:05:00Z

/integrate

openjdk · 2025-05-31T07:06:10Z

Going to push as commit 3a3ea7e.
Since your change was applied there have been 129 commits pushed to the master branch:

19360a9: 8356949: AArch64: Tighten up template interpreter method entry code
061b24d: 8357304: [PPC64] C2: Implement MinV, MaxV and Reduction nodes
c62223a: 8358215: ProblemList jdk/incubator/vector/PreferredSpeciesTest.java
... and 126 more: https://git.openjdk.org/jdk/compare/66747710a49ea6a78aee94d3a3ec6a24b7cc36e5...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-05-31T07:06:18Z

@mrserb Pushed as commit 3a3ea7e.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8357598: Toolkit.removeAWTEventListener should handle null listener i…

72d7788

…n AWTEventListenerProxy

openjdk bot added client [email protected] i18n [email protected] labels May 22, 2025

mrserb added 3 commits May 22, 2025 15:44

Update AWTEventListenerProxyTest.java

6fe27d5

Update AWTEventListenerProxyTest.java

bb545a5

Merge branch 'openjdk:master' into JDK-8357598

3656014

mrserb commented May 25, 2025

View reviewed changes

mrserb marked this pull request as ready for review May 25, 2025 07:51

openjdk bot added the rfr Pull request is ready for review label May 25, 2025

aivanov-jdk approved these changes May 27, 2025

View reviewed changes

test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java Outdated Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label May 27, 2025

Update test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventLi…

afb10b6

…stenerProxyTest.java Co-authored-by: Alexey Ivanov <[email protected]>

openjdk bot removed the ready Pull request is ready to be integrated label May 27, 2025

mrserb requested a review from aivanov-jdk May 29, 2025 08:34

DamonGuy approved these changes May 30, 2025

View reviewed changes

TejeshR13 reviewed May 30, 2025

View reviewed changes

aivanov-jdk approved these changes May 30, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 30, 2025

openjdk bot added the integrated Pull request has been integrated label May 31, 2025

openjdk bot closed this May 31, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 31, 2025

mrserb deleted the JDK-8357598 branch May 31, 2025 07:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8357598: Toolkit.removeAWTEventListener should handle null listener in AWTEventListenerProxy #25401

8357598: Toolkit.removeAWTEventListener should handle null listener in AWTEventListenerProxy #25401

Uh oh!

mrserb commented May 22, 2025 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented May 22, 2025

Uh oh!

openjdk bot commented May 22, 2025 •

edited

Loading

Uh oh!

openjdk bot commented May 22, 2025

Uh oh!

mrserb May 25, 2025

Uh oh!

mlbridge bot commented May 25, 2025 •

edited

Loading

Uh oh!

aivanov-jdk left a comment

Uh oh!

Uh oh!

DamonGuy left a comment

Uh oh!

TejeshR13 May 30, 2025

Uh oh!

aivanov-jdk May 30, 2025

Uh oh!

TejeshR13 May 30, 2025 •

edited

Loading

Uh oh!

aivanov-jdk May 30, 2025

Uh oh!

mrserb commented May 31, 2025

Uh oh!

openjdk bot commented May 31, 2025

Uh oh!

openjdk bot commented May 31, 2025

Uh oh!

Uh oh!

-/*
+/*
+ * @test
+ * @bug 4290704 8357598
+ * @summary Test use of AWTEventListenerProxyTest class
+ */

8357598: Toolkit.removeAWTEventListener should handle null listener in AWTEventListenerProxy #25401

8357598: Toolkit.removeAWTEventListener should handle null listener in AWTEventListenerProxy #25401

Uh oh!

Conversation

mrserb commented May 22, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented May 22, 2025

Uh oh!

openjdk bot commented May 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented May 22, 2025

Uh oh!

mrserb May 25, 2025

Choose a reason for hiding this comment

Uh oh!

mlbridge bot commented May 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

aivanov-jdk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DamonGuy left a comment

Choose a reason for hiding this comment

Uh oh!

TejeshR13 May 30, 2025

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk May 30, 2025

Choose a reason for hiding this comment

Uh oh!

TejeshR13 May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aivanov-jdk May 30, 2025

Choose a reason for hiding this comment

Uh oh!

mrserb commented May 31, 2025

Uh oh!

openjdk bot commented May 31, 2025

Uh oh!

openjdk bot commented May 31, 2025

Uh oh!

Uh oh!

mrserb commented May 22, 2025 •

edited by openjdk bot

Loading

openjdk bot commented May 22, 2025 •

edited

Loading

mlbridge bot commented May 25, 2025 •

edited

Loading

TejeshR13 May 30, 2025 •

edited

Loading