Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4109 from mofleury/jetty-9.4.x 

Support meaningful JMX ObjectNames for HttpDestinations by avoiding race condition at creation
This commit is contained in:
Simone Bordet 2019-10-01 17:31:45 +02:00 committed by GitHub
parent 5b829a10e4 8e51a4d532
commit 72d1a297a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

@ -540,24 +540,14 @@ public class HttpClient extends ContainerLifeCycle
port = normalizePort(scheme, port); port = normalizePort(scheme, port);
Origin origin = new Origin(scheme, host, port); Origin origin = new Origin(scheme, host, port);
HttpDestination destination = destinations.get(origin); return destinations.computeIfAbsent(origin, o ->
if (destination == null)
{ {
destination = transport.newHttpDestination(origin); HttpDestination newDestination = getTransport().newHttpDestination(o);
addManaged(destination); addManaged(newDestination);
HttpDestination existing = destinations.putIfAbsent(origin, destination); if (LOG.isDebugEnabled())
if (existing != null) LOG.debug("Created {}", newDestination);
{ return newDestination;
removeBean(destination); });
destination = existing;
}
else
{
if (LOG.isDebugEnabled())
LOG.debug("Created {}", destination);
}
}
return destination;
} }
protected boolean removeDestination(HttpDestination destination) protected boolean removeDestination(HttpDestination destination)