8284672: Collapse identical catch branches in java.desktop #8154

turbanoff · 2022-04-08T06:50:15Z

Let's take advantage of Java 7 language feature - "Catching Multiple Exception Types".
It simplifies code. Reduces duplication.
Found by IntelliJ IDEA inspection Identical 'catch' branches in 'try' statement

Progress

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

Issue

JDK-8284672: Collapse identical catch branches in java.desktop

Reviewers

Phil Race (@prrace - Reviewer) ⚠️ Review applies to bc19ec42
Alexey Ivanov (@aivanov-jdk - Reviewer) ⚠️ Review applies to 66906b3c
Sergey Bylokhov (@mrserb - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8154

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

Using diff file

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

bridgekeeper · 2022-04-08T06:51:38Z

👋 Welcome back aturbanov! 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 · 2022-04-08T06:54:16Z

@turbanoff The following label will be automatically applied to this pull request:

client

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

mlbridge · 2022-04-11T12:26:13Z

Webrevs

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java

src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbankReader.java

prrace · 2022-04-27T04:49:21Z

src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java

-        } catch (RIFFInvalidFormatException e) {
-            return null;
-        } catch(IOException ioe) {
+        } catch (IOException e) {


Yeah. I think it makes sense to amend behavior here and not catch IOException. Callers should be ready for it.

This getSoundbank method is called when we iterate over providers and check which can be used, unfortunately, that code is not ready for the IOException and we return "null" -> the next provider will be checked. This is a kind of compatibility quirk.

Doesn't IOException mean the next provider is to be checked?

That is the IOException could be handled in the iterator, its code may need to be updated for that. Then the implementations of getSoundbank(URL) could propagate the IOException too and eliminate duplicate code.

InvalidMidiDataException isn't caught there, so the iterator code should handle it.

It is implemented in a way that if the bundled provider will fail we will try some next provider, but if the user add custom provider then getSoundbank(URL) will throw IOException signalling that something went wrong.

I think InvalidMidiDataException should not be caught since that exception means the sound bank provider started to read the file, recognized that the file is supported, but then found the broken midi data.

openjdk · 2022-04-27T17:51:38Z

@turbanoff 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:

8284672: Collapse identical catch branches in java.desktop

Reviewed-by: prr, aivanov, serb

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 1011 new commits pushed to the master branch:

7acdcc1: 8288329: Avoid redundant TreeMap.containsKey call in PolicyParser.read
f62b2bd: 8288480: IGV: toolbar action is not applied to the focused graph
02da5f9: 8263384: IGV: Outline should highlight the Graph that has focus
7d4df6a: 8284404: Too aggressive sweeping with Loom
47b8669: 8288573: Make Executable.getParameterCount() actually abstract
af64d31: Merge
53bf1bf: 8286176: Add JNI_VERSION_19 to jni.h and JNI spec
c254c9d: 8287401: jpackage tests failing on Windows due to powershell issue
ff3db52: 8288534: Out of bound errors for memory segment access mentions wrong values
cc44592: 8287904: Reduce runtime of java.net microbenchmarks
... and 1001 more: https://git.openjdk.org/jdk/compare/8c1870521815a24fd12480e73450c2201542a442...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.

prrace · 2022-04-27T18:05:36Z

/reviewers 2

openjdk · 2022-04-27T18:07:14Z

@prrace
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with 1 of role reviewers, 1 of role authors).

bridgekeeper · 2022-05-25T22:24:06Z

@turbanoff This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

fix formatting

mrserb · 2022-06-16T03:43:55Z

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java

            if (themeName != null) {
            try {
                INSTANCE = new Metacity(themeName);
            } catch (FileNotFoundException ex) {


Is it possible that the FileNotFoundException was ignored intentionally? After this change, it will be traced.

I didn't change how FileNotFoundException is handled. It's still ignored.

For some reason I thought it was merged to the IOException.

mrserb · 2022-06-16T03:49:34Z

src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java

-        } catch (RIFFInvalidFormatException e) {
-            return null;
-        } catch(IOException ioe) {
+        } catch (IOException e) {


This getSoundbank method is called when we iterate over providers and check which can be used, unfortunately, that code is not ready for the IOException and we return "null" -> the next provider will be checked. This is a kind of compatibility quirk.

aivanov-jdk · 2022-06-17T13:41:38Z

src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java

-        } catch (RIFFInvalidFormatException e) {
-            return null;
-        } catch(IOException ioe) {
+        } catch (IOException e) {


Doesn't IOException mean the next provider is to be checked?

That is the IOException could be handled in the iterator, its code may need to be updated for that. Then the implementations of getSoundbank(URL) could propagate the IOException too and eliminate duplicate code.

InvalidMidiDataException isn't caught there, so the iterator code should handle it.

src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java

move '}' to new line

mrserb · 2022-06-16T18:04:53Z

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java

            if (themeName != null) {
            try {
                INSTANCE = new Metacity(themeName);
            } catch (FileNotFoundException ex) {


For some reason I thought it was merged to the IOException.

mrserb · 2022-06-20T08:54:45Z

src/java.desktop/share/classes/com/sun/media/sound/SF2SoundbankReader.java

-        } catch (RIFFInvalidFormatException e) {
-            return null;
-        } catch(IOException ioe) {
+        } catch (IOException e) {


It is implemented in a way that if the bundled provider will fail we will try some next provider, but if the user add custom provider then getSoundbank(URL) will throw IOException signalling that something went wrong.

I think InvalidMidiDataException should not be caught since that exception means the sound bank provider started to read the file, recognized that the file is supported, but then found the broken midi data.

turbanoff · 2022-06-20T08:59:51Z

Thank you for review!
/integrate

openjdk · 2022-06-20T09:02:25Z

Going to push as commit 695d865.
Since your change was applied there have been 1011 commits pushed to the master branch:

7acdcc1: 8288329: Avoid redundant TreeMap.containsKey call in PolicyParser.read
f62b2bd: 8288480: IGV: toolbar action is not applied to the focused graph
02da5f9: 8263384: IGV: Outline should highlight the Graph that has focus
7d4df6a: 8284404: Too aggressive sweeping with Loom
47b8669: 8288573: Make Executable.getParameterCount() actually abstract
af64d31: Merge
53bf1bf: 8286176: Add JNI_VERSION_19 to jni.h and JNI spec
c254c9d: 8287401: jpackage tests failing on Windows due to powershell issue
ff3db52: 8288534: Out of bound errors for memory segment access mentions wrong values
cc44592: 8287904: Reduce runtime of java.net microbenchmarks
... and 1001 more: https://git.openjdk.org/jdk/compare/8c1870521815a24fd12480e73450c2201542a442...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-06-20T09:02:39Z

@turbanoff Pushed as commit 695d865.

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

[PATCH] Collapse identical catch branches in java.desktop

bc19ec4

openjdk bot added the client client-libs-dev@openjdk.org label Apr 8, 2022

turbanoff changed the title ~~[PATCH] Collapse identical catch branches in java.desktop~~ 8284672: Collapse identical catch branches in java.desktop Apr 11, 2022

openjdk bot added the rfr Pull request is ready for review label Apr 11, 2022

prrace approved these changes Apr 27, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 27, 2022

openjdk bot removed the ready Pull request is ready to be integrated label Apr 27, 2022

8284672: Collapse identical catch branches in java.desktop

66906b3

fix formatting

mrserb reviewed Jun 16, 2022

View reviewed changes

aivanov-jdk approved these changes Jun 17, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 17, 2022

8284672: Collapse identical catch branches in java.desktop

028be32

move '}' to new line

mrserb approved these changes Jun 20, 2022

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 20, 2022

openjdk bot closed this Jun 20, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 20, 2022

turbanoff deleted the identical_catch_java.desktop branch October 27, 2022 18:40

8284672: Collapse identical catch branches in java.desktop #8154

8284672: Collapse identical catch branches in java.desktop #8154

Uh oh!

Conversation

turbanoff commented Apr 8, 2022 • 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 Apr 8, 2022

Uh oh!

openjdk bot commented Apr 8, 2022

Uh oh!

mlbridge bot commented Apr 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Apr 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

prrace commented Apr 27, 2022

Uh oh!

openjdk bot commented Apr 27, 2022

Uh oh!

bridgekeeper bot commented May 25, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

turbanoff commented Jun 20, 2022

Uh oh!

openjdk bot commented Jun 20, 2022

Uh oh!

openjdk bot commented Jun 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

turbanoff commented Apr 8, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Apr 11, 2022 •

edited

Loading

openjdk bot commented Apr 27, 2022 •

edited

Loading