git: openjdk/jdk17u-dev: 2 new changesets

[Martin Doerr]

Changeset: cda3768c
Author:    Martin Doerr <mdoerr at openjdk.org>
Date:      2024-06-10 08:17:31 +0000
URL:       https://git.openjdk.org/jdk17u-dev/commit/cda3768ca9d8cf6f41eaf82bf6065a4afc422fe4

8326734: text-decoration applied to <span> lost when mixed with <u> or <s>
8325620: HTMLReader uses ConvertAction instead of specified CharacterAction for <b>, <i>, <u>

Backport-of: cd3e4c03661f770ebeefcd3637d56589243ac0a9

! src/java.desktop/share/classes/javax/swing/text/html/CSS.java
! src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
! src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java
! src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
+ test/jdk/javax/swing/text/html/HTMLDocument/HTMLStrikeOnly.java
+ test/jdk/javax/swing/text/html/HTMLDocument/HTMLTextDecoration.java
+ test/jdk/javax/swing/text/html/HTMLDocument/HTMLUnderlineOnly.java
! test/jdk/javax/swing/text/html/HTMLDocument/HTMLUnderlineStrike.java

Changeset: 36384e8b
Author:    Martin Doerr <mdoerr at openjdk.org>
Date:      2024-06-10 08:17:54 +0000
URL:       https://git.openjdk.org/jdk17u-dev/commit/36384e8b0fab9d93f39844773e0168cb566e36ae

8323670: A few client tests intermittently throw ConcurrentModificationException

Backport-of: 70e7cdcb9ecedd455cf701b5c7ad05286ac0067d

! src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java