Skip to content

Conversation

@caojoshua
Copy link
Contributor

@caojoshua caojoshua commented Mar 7, 2022

One rejected hunk on the copyright year:

diff a/src/java.base/share/classes/java/lang/StringCoding.java b/src/java.base/share/classes/java/lang/StringCoding.java        (rejected hunks)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

Otherwise, this is a clean backport.


Progress

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

Issue

  • JDK-8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 860

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 7, 2022

👋 Welcome back caojoshua! 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 added the rfr Pull request is ready for review label Mar 7, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 7, 2022

Webrevs

@caojoshua caojoshua changed the title 8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result Backport aba3431c4e594a68454faca62b6ba1b6840c12c6 Mar 8, 2022
@openjdk openjdk bot changed the title Backport aba3431c4e594a68454faca62b6ba1b6840c12c6 8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result Mar 8, 2022
@openjdk
Copy link

openjdk bot commented Mar 8, 2022

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Mar 8, 2022
@phohensee
Copy link
Member

/clean

@openjdk openjdk bot added the clean Identical backport; no merge resolution required label Mar 8, 2022
@openjdk
Copy link

openjdk bot commented Mar 8, 2022

@phohensee This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Mar 8, 2022

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

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

8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result

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

  • 85a89c5: 8211962: Implicit narrowing in MacOSX java.desktop jsound
  • bca1970: 8223143: Restructure/clean-up for 'loopexit_or_null()'.
  • 571d323: 8208249: TriggerUnloadingByFillingMetaspace generates garbage class names
  • 87b6007: 8279837: C2: assert(is_Loop()) failed: invalid node class: Region
  • 56e2384: 8208246: flags duplications in vmTestbase_vm_g1classunloading tests
  • 7a1d1e0: Merge
  • 1cff563: 8277795: ldap connection timeout not honoured under contention
  • e339111: 8276141: XPathFactory set/getProperty method
  • b0c0dc5: 8275082: Update XML Security for Java to 2.3.0
  • 4b9bba6: 8276990: Memory leak in invoker.c fillInvokeRequest() during JDI operations

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 the ready Pull request is ready to be integrated label Mar 8, 2022
@caojoshua
Copy link
Contributor Author

/integrate

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

openjdk bot commented Mar 9, 2022

@caojoshua
Your change (at version 61c6d2f) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 9, 2022

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

  • 85a89c5: 8211962: Implicit narrowing in MacOSX java.desktop jsound
  • bca1970: 8223143: Restructure/clean-up for 'loopexit_or_null()'.
  • 571d323: 8208249: TriggerUnloadingByFillingMetaspace generates garbage class names
  • 87b6007: 8279837: C2: assert(is_Loop()) failed: invalid node class: Region
  • 56e2384: 8208246: flags duplications in vmTestbase_vm_g1classunloading tests
  • 7a1d1e0: Merge
  • 1cff563: 8277795: ldap connection timeout not honoured under contention
  • e339111: 8276141: XPathFactory set/getProperty method
  • b0c0dc5: 8275082: Update XML Security for Java to 2.3.0
  • 4b9bba6: 8276990: Memory leak in invoker.c fillInvokeRequest() during JDI operations

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 9, 2022

@phohensee @caojoshua Pushed as commit 8e01531.

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

@caojoshua caojoshua deleted the 8258956 branch July 5, 2022 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants