jdk11u-dev
jdk11u-dev copied to clipboard
8329013: StackOverflowError when starting Apache Tomcat with signed jar
Backport of JDK-8329013
- This PR contains two commits
- commit 1:
- is the original git apply
- and the
src/java.base/share/classes/jdk/internal/misc/ThreadTracker.java
file needed by this PR- The
ThreadTracker.java
class was added by https://github.com/openjdk/jdk/commit/9583e3657e43cc1c6f2101a64534564db2a9bd84 , which is pretty big forVirtual Threads
(JDK-8284161) and we have no intention to back port this change to Java 11 right now - So here we simply copy the current code of
ThreadTracker.java
tojdk11u-dev
- The
- commit 2:
- Manual merge of
src/java.base/share/classes/jdk/internal/event/EventHelper.java
based on theEventHelper.java.rej
file. The change to this file can beconsidered as clean
. - Fix java 11 compile error for
ThreadTracker.java
- Manual merge of
- commit 3: The Inner Class
ThreadRef
for the originalRecord
type should befinal
Testing
- Local: Test passed
-
RecursiveEventHelper.java
: Test results: passed: 1
-
- Pipeline: All checks have passed
- Testing Machine: SAP nightlies passed on
2024-04-28
- Automated jtreg test: jtreg_jdk_tier2
-
jdk/security/logging/RecursiveEventHelper.java
: SUCCESSFUL GitHub 📊⏲ - [2,152 msec]
- Testing Machine with commit 3: SAP nightlies passed on
2024-05-04
- Automated jtreg test: jtreg_jdk_tier2
- jdk/security/logging/RecursiveEventHelper.java: SUCCESSFUL GitHub 📊⏲ - [2,301 msec]
Progress
- [x] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [ ] JDK-8329013 needs maintainer approval
Issue
- JDK-8329013: StackOverflowError when starting Apache Tomcat with signed jar (Bug - P4 - Requested)
Reviewers
- Matthias Baesken (@MBaesken - Reviewer)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2687/head:pull/2687
$ git checkout pull/2687
Update a local copy of the PR:
$ git checkout pull/2687
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2687/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 2687
View PR using the GUI difftool:
$ git pr show -t 2687
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2687.diff
Webrev
:wave: Welcome back ashi! 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.
@amosshi This change now passes all automated pre-integration checks.
After integration, the commit message for the final commit will be:
8329013: StackOverflowError when starting Apache Tomcat with signed jar
Reviewed-by: mbaesken
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 39 new commits pushed to the master
branch:
- c35d30d6fecabcb10cd2011fca39ddee219337b0: 8331263: Bump update version for OpenJDK: jdk-11.0.25
- 47fd86ca1c51280629b9f2b86b659c91ffeee22a: 8273153: Consolidate file_exists into os:file_exists
- 8a489e58b37611f4088efe19b2a43a9e54f7866d: 8293887: AArch64 build failure with GCC 12 due to maybe-uninitialized warning in libfdlibm k_rem_pio2.c
- 35333744a8f3cf25c95ee691791b00098dde9a44: 8312194: test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ec.java cannot handle empty modules
- b7596f3f9d0b442628272459f3f22b3d36634967: 8316138: Add GlobalSign 2 TLS root certificates
- b8ee2aa15ab538f5a0623b391e1c64e5e63e167a: 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used
- 1d6965fd4eba8c22589f1833e3a1639f05ada771: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
- 2a804f54aa8f921942e98557770446b06c19c1aa: 8297082: Remove sun/tools/jhsdb/BasicLauncherTest.java from problem list
- ece9b2cd3ba498d36832bc168237c3d60ecb4d4a: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
- 2ff4d4edfb5a069ac74cb65c974d5861e6147be6: 8318322: Update IANA Language Subtag Registry to Version 2023-10-16
- ... and 29 more: https://git.openjdk.org/jdk11u-dev/compare/dabf4d16a190f5169a2eb56ff964f9a3365bce62...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.
➡️ To integrate this PR with the above commit message to the master
branch, type /integrate in a new comment.
This backport pull request has now been updated with issue from the original commit.
⚠️ @amosshi This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.
I don't have time to review this, but kudos for clearly delineating and explaining the delta between this patch and its original. Wish every backporter would do this.
/approval request "Un-Clean backport. SAP nightlies passed on 2024-05-04”
@amosshi 8329013: The approval request has been created successfully.
/integrate
Going to push as commit 7b377ac0ba396d6a1ca4f80ada2520a7f2c56082.
Since your change was applied there have been 40 commits pushed to the master
branch:
- 31a780d851236a143b7c86f9c7137b67803da9c9: 8276819: javax/print/PrintServiceLookup/FlushCustomClassLoader.java fails to free
- c35d30d6fecabcb10cd2011fca39ddee219337b0: 8331263: Bump update version for OpenJDK: jdk-11.0.25
- 47fd86ca1c51280629b9f2b86b659c91ffeee22a: 8273153: Consolidate file_exists into os:file_exists
- 8a489e58b37611f4088efe19b2a43a9e54f7866d: 8293887: AArch64 build failure with GCC 12 due to maybe-uninitialized warning in libfdlibm k_rem_pio2.c
- 35333744a8f3cf25c95ee691791b00098dde9a44: 8312194: test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ec.java cannot handle empty modules
- b7596f3f9d0b442628272459f3f22b3d36634967: 8316138: Add GlobalSign 2 TLS root certificates
- b8ee2aa15ab538f5a0623b391e1c64e5e63e167a: 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used
- 1d6965fd4eba8c22589f1833e3a1639f05ada771: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
- 2a804f54aa8f921942e98557770446b06c19c1aa: 8297082: Remove sun/tools/jhsdb/BasicLauncherTest.java from problem list
- ece9b2cd3ba498d36832bc168237c3d60ecb4d4a: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
- ... and 30 more: https://git.openjdk.org/jdk11u-dev/compare/dabf4d16a190f5169a2eb56ff964f9a3365bce62...master
Your commit was automatically rebased without conflicts.
@amosshi Pushed as commit 7b377ac0ba396d6a1ca4f80ada2520a7f2c56082.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.