Navigation Menu

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

8272702: Resolving URI relative path with no / may lead to incorrect toString #1176

Closed
wants to merge 1 commit into from

Conversation

rvansa
Copy link
Contributor

@rvansa rvansa commented Feb 16, 2023

I backport this as it affects to JDK 17.
Does not apply clean due to a conflict with https://bugs.openjdk.org/browse/JDK-8285521 but it's the same logic.


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

Error

 ⚠️ The pull request body must not be empty.

Issue

  • JDK-8272702: Resolving URI relative path with no / may lead to incorrect toString

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1176

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

Using diff file

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


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-8272702: Resolving URI relative path with no / may lead to incorrect toString

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1176

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 16, 2023

👋 Welcome back rvansa! 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 79597f1ea6844f374beeeba219719cd9d5fe7d03 8272702: Resolving URI relative path with no / may lead to incorrect toString Feb 16, 2023
@openjdk
Copy link

openjdk bot commented Feb 16, 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 Feb 16, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 16, 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.

The URI.java change result is a bit messy relative to tip, but looks correct.

@openjdk
Copy link

openjdk bot commented Feb 16, 2023

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

8272702: Resolving URI relative path with no / may lead to incorrect toString

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

  • da62b2b: 8299970: Speed up compiler/arraycopy/TestArrayCopyConjoint.java
  • fcd9110: 8298472: AArch64: Detect Ampere-1 and Ampere-1A CPUs and set default options
  • a6f4cf1: 8302152: Speed up tests with infinite loops, sleep less
  • 49ff97c: 8301342: Prefer ArrayList to LinkedList in LayoutComparator
  • 5027f56: 8288332: Tier1 validate-source fails after 8279614
  • d0e0633: 8302692: [17u] Update GHA Boot JDK to 17.0.6

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

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 Feb 16, 2023
@GoeLin
Copy link
Member

GoeLin commented Feb 21, 2023

How did you test this? Does the test pass with the fix?

@rvansa
Copy link
Contributor Author

rvansa commented Feb 21, 2023

@GoeLin Yes, I tested this through make test TEST=test/jdk/java/net/:

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk/java/net                             595   595     0     0   
==============================
TEST SUCCESS

@rvansa
Copy link
Contributor Author

rvansa commented Feb 24, 2023

/integrate

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

openjdk bot commented Feb 24, 2023

@rvansa
Your change (at version 87fc7fc) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 24, 2023

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

  • da62b2b: 8299970: Speed up compiler/arraycopy/TestArrayCopyConjoint.java
  • fcd9110: 8298472: AArch64: Detect Ampere-1 and Ampere-1A CPUs and set default options
  • a6f4cf1: 8302152: Speed up tests with infinite loops, sleep less
  • 49ff97c: 8301342: Prefer ArrayList to LinkedList in LayoutComparator
  • 5027f56: 8288332: Tier1 validate-source fails after 8279614
  • d0e0633: 8302692: [17u] Update GHA Boot JDK to 17.0.6

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 24, 2023
@openjdk openjdk bot closed this Feb 24, 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 Feb 24, 2023
@openjdk
Copy link

openjdk bot commented Feb 24, 2023

@phohensee @rvansa Pushed as commit bf4e659.

💡 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