Skip to content

Merge master jdk-21+35 into openj9-staging - #29

Merged
keithc-ca merged 18 commits into
ibmruntimes:openj9-stagingfrom
JasonFengJ9:mergestaging
Aug 11, 2023
Merged

Merge master jdk-21+35 into openj9-staging#29
keithc-ca merged 18 commits into
ibmruntimes:openj9-stagingfrom
JasonFengJ9:mergestaging

Conversation

@JasonFengJ9

Copy link
Copy Markdown
Member

Merge master jdk-21+35 into openj9-staging

Conflicts:

	test/jdk/java/foreign/TestLayouts.java

Signed-off-by: Jason Feng fengj@ca.ibm.com

RealCLanger and others added 15 commits August 3, 2023 07:37
Reviewed-by: mbaesken
Backport-of: 5ff42d14294199eb3bf10b66530f9249fb68810d
…f different output - expected [[i4](struct)] but found [[I4](struct)]

Reviewed-by: mbaesken
Backport-of: d1cc2782606e8a3cfead9055aa845e48e851edd4
…ation/AmazonCA.java fails

Reviewed-by: mbaesken
Backport-of: 4c2e54fb055bee0af5cd838fdd32a0f7902d51e3
Reviewed-by: clanger
Backport-of: 34173ff0d11667baffa6604e6f1886b8976ab2c2
Reviewed-by: naoto, iris
Backport-of: 9b55e9a706de9893b1a71c7a6a4e23c4b8842f18
Reviewed-by: chagedorn
Backport-of: d3b578f1c9d296ce8f99c70069df886e9f2dbef9
…ldcard

Reviewed-by: jjg, vromero
Backport-of: f14245b3880ff735ae231b4c7d2c6b6907c5f7d4
…xception if last fragment is UTF16

Reviewed-by: redestad
Backport-of: 6864441163f946d0bec7380a2a120e31b812a6dc
…emoryError

Reviewed-by: aboldtch, tschatzl
Backport-of: 28fd7a1739fd3c50c43ebfe6017a835225a453c6
Issue eclipse-openj9/openj9#11930

The name isn't set in the TimerThread constructor, it calls
Thread.genThreadName() which consumes the "Thread-0" name. This causes
the test to fail because it expects this name. This could have an impact
on / confuse users which expect consistent thread names. Depending on
the timing of the Attach API AttachHandler / FilelockTimer creation, an
application can get different default thread names from run to run.

Backport of ibmruntimes/openj9-openjdk-jdk#640

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
Set a default thread name for java.util.TimerThread
Apply the fix for harfbuzz#4138 more directly.

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
@JasonFengJ9
JasonFengJ9 requested a review from keithc-ca August 11, 2023 12:55
Comment thread test/jdk/java/foreign/TestLayouts.java
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Conflicts:
	test/jdk/java/foreign/TestLayouts.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@keithc-ca
keithc-ca merged commit 8306f2c into ibmruntimes:openj9-staging Aug 11, 2023
@JasonFengJ9
JasonFengJ9 deleted the mergestaging branch August 11, 2023 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants