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

8193277: SimpleFileObject inconsistency between getName and getShortName #759

Closed
wants to merge 1 commit into from

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Jan 13, 2022

This is a backport of JDK-8193277: SimpleFileObject inconsistency between getName and getShortName

Original patch applies cleanly.

Testing: tier1 tests pass


Progress

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

Issue

  • JDK-8193277: SimpleFileObject inconsistency between getName and getShortName

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/759/head:pull/759
$ git checkout pull/759

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 759

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/759.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2022

👋 Welcome back cushon! 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 072068682352adb0a979b2ecc40232caea46c253 8193277: SimpleFileObject inconsistency between getName and getShortName Jan 13, 2022
@openjdk
Copy link

openjdk bot commented Jan 13, 2022

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

@openjdk
Copy link

openjdk bot commented Jan 13, 2022

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

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

8193277: SimpleFileObject inconsistency between getName and getShortName

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

  • 96c8499: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • 3a96302: 8251132: make main classes public in vmTestbase/jit tests

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.

➡️ 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 13, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 13, 2022

Webrevs

@cushon
Copy link
Contributor Author

cushon commented Jan 14, 2022

JDK-8193277 has been tagged jdk11u-fix-yes

@cushon
Copy link
Contributor Author

cushon commented Jan 14, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 14, 2022
@openjdk
Copy link

openjdk bot commented Jan 14, 2022

@cushon
Your change (at version 3be7ff2) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 17, 2022

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

  • e7b89f7: 8225559: assertion error at TransTypes.visitApply
  • 5ab97c4: 8220634: SymLinkArchiveTest should handle not being able to create symlinks
  • a29949b: 8214026: Canonicalized archive paths appearing in diagnostics
  • 538013a: 8251126: nsk.share.GoldChecker should read golden file from ${test.src}
  • fac0f5a: 8237798: rewrite vmTestbase/jit/tiered from shell to java
  • f5ade3e: 8262134: compiler/uncommontrap/TestDeoptOOM.java failed with "guarantee(false) failed: wrong number of expression stack elements during deopt"
  • 89f4d44: 8210194: [TESTBUG] jvmti_FollowRefObjects.cpp missing initializer for member _jvmtiHeapCallbacks::heap_reference_callback
  • 898b8de: 8277441: CompileQueue::add fails with assert(_last->next() == __null) failed: not last
  • e3da580: 8273704: DrawStringWithInfiniteXform.java failed : drawString with InfiniteXform transform takes long time
  • 96c8499: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • ... and 1 more: https://git.openjdk.java.net/jdk11u-dev/compare/00dc442f6418dff89fbd8903678b63a442e72c9e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 17, 2022

@RealCLanger @cushon Pushed as commit 4a5caa0.

💡 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 clean integrated Pull request has been integrated
2 participants