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

8262486: Merge trivial JDWP agent changes from the loom repo to the jdk repo #2815

Closed
wants to merge 2 commits into from

Conversation

@plummercj
Copy link
Contributor

@plummercj plummercj commented Mar 3, 2021

In the loom repo there are a number of trivial changes to the JDWP agent that are not loom specific. Moving them to the jdk repo will make future merges simpler, along with making it easier to get a diff of the important differences between the loom and jdk repos, without the clutter of these trivial changes. The changes I'd like to merge are:

  1. Very minor code refactoring.
  2. Comment additions, fixes, and improvements.
  3. Minor indentation and whitespace changes.
  4. Added a trivial assert

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8262486: Merge trivial JDWP agent changes from the loom repo to the jdk repo

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2815/head:pull/2815
$ git checkout pull/2815

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 3, 2021

👋 Welcome back cjplummer! 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 3, 2021

@plummercj 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.

Loading

@plummercj plummercj marked this pull request as ready for review Mar 3, 2021
@openjdk openjdk bot added the rfr label Mar 3, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 3, 2021

Webrevs

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 3, 2021

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

8262486: Merge trivial JDWP agent changes from the loom repo to the jdk repo

Reviewed-by: amenkov, lmesnik

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

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.

Loading

@openjdk openjdk bot added the ready label Mar 3, 2021
lmesnik
lmesnik approved these changes Mar 3, 2021
@plummercj
Copy link
Contributor Author

@plummercj plummercj commented Mar 5, 2021

@alexmenkov @lmesnik I made a couple of very minor edits. Can you please approve them. Thanks!

Loading

@alexmenkov
Copy link

@alexmenkov alexmenkov commented Mar 5, 2021

@alexmenkov @lmesnik I made a couple of very minor edits. Can you please approve them. Thanks!

Still LGTM

Loading

lmesnik
lmesnik approved these changes Mar 5, 2021
@plummercj
Copy link
Contributor Author

@plummercj plummercj commented Mar 9, 2021

/integrate

Loading

@openjdk openjdk bot closed this Mar 9, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 9, 2021

@plummercj Since your change was applied there have been 146 commits pushed to the master branch:

  • 86fac95: 8263142: Delete unused entry points in libawt/libawt_xawt/libawt_headless
  • b7f0b3f: 8252173: Use handles instead of jobjects in modules.cpp
  • a6e34b3: 8262829: Native crash in Win32PrintServiceLookup.getAllPrinterNames()
  • fbe40e8: 8252399: Update mapMulti documentation to use type test pattern instead of instanceof once JEP 375 exits preview
  • 0f2402d: 8263190: Update java.io, java.math, and java.text to use instanceof pattern variable
  • 4f0a12e: 8262323: do not special case JVMCI in tiered compilation policy
  • 3022baa: 8263167: IGV: build fails with "taskdef AutoUpdate cannot be found"
  • 0bc4562: 8263068: Rename safefetch.hpp to safefetch.inline.hpp
  • 5bfc5fd: 8263051: Modernize the code in the java.awt.color package
  • 5b9b170: 8262955: Unify os::fork_and_exec() across Posix platforms
  • ... and 136 more: https://git.openjdk.java.net/jdk/compare/35c0a6956cae6d47f82cb7e9f2bd2c479acfa582...master

Your commit was automatically rebased without conflicts.

Pushed as commit 2218e72.

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

Loading

@plummercj plummercj deleted the 8262486-jdwp_edits branch Mar 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants