Skip to content

Commit

Permalink
8316031: SSLFlowDelegate should not log from synchronized block
Browse files Browse the repository at this point in the history
Reviewed-by: djelinski
  • Loading branch information
dfuch committed Sep 15, 2023
1 parent 8dfde28 commit dc5ca1d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -971,10 +971,12 @@ private void handleError(Throwable t) {

boolean stopped;

private synchronized void normalStop() {
if (stopped)
return;
stopped = true;
private void normalStop() {
synchronized (this) {
if (stopped)
return;
stopped = true;
}
reader.stop();
writer.stop();
// make sure the alpnCF is completed.
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* @test
* @summary Tests HttpClient usage when configured with a local address to bind
* to, when sending requests
* @bug 8209137
* @bug 8209137 8316031
* @library /test/lib /test/jdk/java/net/httpclient/lib
*
* @build jdk.test.lib.net.SimpleSSLContext jdk.test.lib.net.IPSupport
Expand Down

3 comments on commit dc5ca1d

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dfuch
Copy link
Member Author

@dfuch dfuch commented on dc5ca1d Sep 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on dc5ca1d Sep 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dfuch the backport was successfully created on the branch dfuch-backport-dc5ca1d3 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit dc5ca1d3 from the openjdk/jdk repository.

The commit being backported was authored by Daniel Fuchs on 15 Sep 2023 and was reviewed by Daniel Jeliński.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git dfuch-backport-dc5ca1d3:dfuch-backport-dc5ca1d3
$ git checkout dfuch-backport-dc5ca1d3
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git dfuch-backport-dc5ca1d3

Please sign in to comment.