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

8234808: jdb quoted option parsing broken #1967

Closed

Conversation

luchenlin
Copy link
Contributor

@luchenlin luchenlin commented Jun 20, 2023

I backport this for parity with 11.0.20-oracle.
Tests pass. SAP nightly testing passed.
src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Env.java
Copyright
Resolved due to context
src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
Copyright
Resolved due to context
src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/VMConnection.java
Copyright
Resolved due to context
test/jdk/com/sun/jdi/JdbOptions.java
Resolved due to context


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-8234808: jdb quoted option parsing broken (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/1967/head:pull/1967
$ git checkout pull/1967

Update a local copy of the PR:
$ git checkout pull/1967
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/1967/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1967

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1967.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 20, 2023

👋 Welcome back luchenlin! 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 openjdk bot changed the title Backport d1f9b8a8b54843f06a93078c4a058af86fcc2aac 8234808: jdb quoted option parsing broken Jun 20, 2023
@openjdk
Copy link

openjdk bot commented Jun 20, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 20, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 20, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm, but please also backport after this JDK-8260878 which fixes a bug in JdbOptions.java.

@openjdk
Copy link

openjdk bot commented Jun 20, 2023

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

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

8234808: jdb quoted option parsing broken

Reviewed-by: phh

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

  • cc88f4c: 8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
  • 4dd85cb: 8297587: Upgrade JLine to 3.22.0
  • e0b98bc: 8292033: Move jdk.X509Certificate event logic to JCA layer
  • b2e04df: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 7f1047e: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • 513732d: 8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
  • 817254d: 8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
  • 77837e3: 8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
  • e30705e: 8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
  • ... and 17 more: https://git.openjdk.org/jdk11u-dev/compare/2cc45963906f088a56aad599a58e2842a214de7b...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 20, 2023
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 26, 2023
@openjdk
Copy link

openjdk bot commented Jun 26, 2023

@luchenlin
Your change (at version e972386) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Jun 26, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 26, 2023

Going to push as commit 97c07a1.
Since your change was applied there have been 28 commits pushed to the master branch:

  • 5506ecf: 8254350: CompletableFuture.get may swallow InterruptedException
  • cc88f4c: 8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
  • 4dd85cb: 8297587: Upgrade JLine to 3.22.0
  • e0b98bc: 8292033: Move jdk.X509Certificate event logic to JCA layer
  • b2e04df: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 7f1047e: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • 513732d: 8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
  • 817254d: 8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
  • 77837e3: 8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
  • ... and 18 more: https://git.openjdk.org/jdk11u-dev/compare/2cc45963906f088a56aad599a58e2842a214de7b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 26, 2023
@openjdk openjdk bot closed this Jun 26, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 26, 2023
@openjdk
Copy link

openjdk bot commented Jun 26, 2023

@GoeLin @luchenlin Pushed as commit 97c07a1.

💡 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
backport integrated Pull request has been integrated
3 participants