archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8260366: ExtendedSocketOptions <clinit> can deadlock in some circumstances

Browse source 
Reviewed-by: dfuchs
This commit is contained in:
Jaikiran Pai 2021-02-26 14:07:35 +00:00
parent de3f519dc9
commit 240f2a1bb7
2 changed files with 182 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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
@ -167,25 +167,35 @@ public abstract class ExtendedSocketOptions {
private static volatile ExtendedSocketOptions instance;
public static final ExtendedSocketOptions getInstance() { return instance; }
/** Registers support for extended socket options. Invoked by the jdk.net module. */
public static final void register(ExtendedSocketOptions extOptions) {
if (instance != null)
throw new InternalError("Attempting to reregister extended options");
instance = extOptions;
}
static {
public static ExtendedSocketOptions getInstance() {
ExtendedSocketOptions ext = instance;
if (ext != null) {
return ext;
}
try {
// If the class is present, it will be initialized which
// triggers registration of the extended socket options.
Class<?> c = Class.forName("jdk.net.ExtendedSocketOptions");
ext = instance;
} catch (ClassNotFoundException e) {
// the jdk.net module is not present => no extended socket options
instance = new NoExtendedSocketOptions();
synchronized (ExtendedSocketOptions.class) {
ext = instance;
if (ext != null) {
return ext;
}
// the jdk.net module is not present => no extended socket options
ext = instance = new NoExtendedSocketOptions();
}
}
return ext;
}
/** Registers support for extended socket options. Invoked by the jdk.net module. */
public static synchronized void register(ExtendedSocketOptions extOptions) {
if (instance != null)
throw new InternalError("Attempting to reregister extended options");
instance = extOptions;
}
static final class NoExtendedSocketOptions extends ExtendedSocketOptions {