Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8283799: Collapse identical catch branches in jdk.hotspot.agent #7973

Closed

Conversation

turbanoff
Copy link
Member

@turbanoff turbanoff commented Mar 26, 2022

Let's take advantage of Java 7 languate feature - "Catching Multiple Exception Types".
It simplifies code. Reduce 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

Issue

  • JDK-8283799: Collapse identical catch branches in jdk.hotspot.agent

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7973/head:pull/7973
$ git checkout pull/7973

Update a local copy of the PR:
$ git checkout pull/7973
$ git pull https://git.openjdk.java.net/jdk pull/7973/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7973

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7973.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 26, 2022

👋 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
Copy link

openjdk bot commented Mar 26, 2022

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

  • serviceability

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.

@openjdk openjdk bot added the serviceability label Mar 26, 2022
@turbanoff turbanoff changed the title [PATCH] Collapse identical catch branches in jdk.hotspot.agent 8283799: Collapse identical catch branches in jdk.hotspot.agent Mar 28, 2022
@openjdk openjdk bot added the rfr label Mar 28, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 28, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 28, 2022

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

8283799: Collapse identical catch branches in jdk.hotspot.agent

Reviewed-by: lmesnik, amenkov

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

  • d8fd222: 8282538: PKCS11 tests fail on CentOS Stream 9
  • d472c01: 8283711: Remove redundant 'new String' calls after concatenation
  • c0aecd1: 8280400: JDK 19 L10n resource files update - msgdrop 10
  • f0282d7: 8279488: ProcessBuilder inherits contextClassLoader when spawning a process reaper thread
  • a577656: 8282943: Unused weird key in compiler.properties
  • 7f2a3ca: 8281561: Disable http DIGEST mechanism with MD5 and SHA-1 by default
  • 0c472c8: 8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
  • d6fa8b0: 8283469: Don't use memset to initialize members in FileMapInfo and fix memory leak
  • 8567266: 8283683: Make ThreadLocalRandom a final class
  • f4eaa16: 8283728: jdk.hotspot.agent: Wrong location for RISCV64ThreadContext.java
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/c587b29bc9ca7e6d3879fda7df099b7411624f19...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 openjdk bot added the ready label Mar 28, 2022
@turbanoff
Copy link
Member Author

turbanoff commented Mar 31, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 31, 2022

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

  • 1ca0ede: 8283725: Launching java with "-Xlog:gc*=trace,safepoint*=trace,class*=trace" crashes the JVM
  • c9a469a: 8283784: java_lang_String::as_platform_dependent_str stores to oop in native state
  • fbb8ca5: 8281717: Cover logout method for several LoginModule
  • e0a8669: 8281223: Improve the API documentation of HttpRequest.Builder::build to state that the default implementation provided by the JDK returns immutable objects.
  • eeca3a3: 8253569: javax.xml.catalog.Catalog.matchURI() implementation should reset state variables
  • ec0897a: 8281705: SourceLauncherTest.testSystemProperty isn't being run
  • 1ddab6f: 8283060: RawNativeLibraries should allow multiple clients to load/unload the same library
  • 835c7e8: 8283907: Fix Huawei copyright in various files
  • b8dd21b: 8283801: Cleanup confusing String.toString calls
  • ce27d9d: 8283494: Factor out calculation of actual number of XMM registers
  • ... and 57 more: https://git.openjdk.java.net/jdk/compare/c587b29bc9ca7e6d3879fda7df099b7411624f19...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Mar 31, 2022
@openjdk openjdk bot closed this Mar 31, 2022
@openjdk openjdk bot removed ready rfr labels Mar 31, 2022
@openjdk
Copy link

openjdk bot commented Mar 31, 2022

@turbanoff Pushed as commit 3e643f4.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated serviceability
3 participants