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

only release connection when channel got released to avoid double connection release race condition 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2021-05-17 10:20:42 +02:00
parent 92f6eabb26
commit 0b97b8415b
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java
View File

@ -106,8 +106,8 @@ public class HttpChannelOverHTTP2 extends HttpChannel
public void release() public void release()
{ {
setStream(null); setStream(null);
connection.release(this); if (connection.release(this))
getHttpDestination().release(getHttpConnection()); getHttpDestination().release(getHttpConnection());
} }
@Override @Override

4
jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java
View File

@ -151,7 +151,7 @@ public class HttpConnectionOverHTTP2 extends HttpConnection implements Sweeper.S
return new HttpChannelOverHTTP2(getHttpDestination(), this, getSession()); return new HttpChannelOverHTTP2(getHttpDestination(), this, getSession());
} }
protected void release(HttpChannelOverHTTP2 channel) protected boolean release(HttpChannelOverHTTP2 channel)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Released {}", channel); LOG.debug("Released {}", channel);
@ -162,10 +162,12 @@ public class HttpConnectionOverHTTP2 extends HttpConnection implements Sweeper.S
channel.destroy(); channel.destroy();
else if (isRecycleHttpChannels()) else if (isRecycleHttpChannels())
idleChannels.offer(channel); idleChannels.offer(channel);
return true;
} }
else else
{ {
channel.destroy(); channel.destroy();
return false;
} }
} }

8
jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java
View File

@ -431,7 +431,13 @@ public class Pool<T> implements AutoCloseable, Dumpable
// iterate the copy and close its entries // iterate the copy and close its entries
for (Entry entry : copy) for (Entry entry : copy)
{ {
if (entry.tryRemove() && entry.pooled instanceof Closeable) boolean removed = entry.tryRemove();
if (!removed)
{
if (LOGGER.isDebugEnabled())
LOGGER.debug("Pooled object still in use: {}", entry);
}
if (removed && entry.pooled instanceof Closeable)
IO.close((Closeable)entry.pooled); IO.close((Closeable)entry.pooled);
} }
} }