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

Issue #2757 - Possible double release of HTTP/2 ByteBuffers. 

Clarified the NetworkBuffer API semantic so that the code is now simpler.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2018-08-01 18:24:42 +02:00
parent 0ba1d9b5a5
commit 8c296e7d52
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java
View File

@ -253,7 +253,7 @@ public class HTTP2Connection extends AbstractConnection implements WriteFlusher.
}
finally
{
released = buffer.tryRelease();
released = buffer.release();
if (failed && released)
releaseNetworkBuffer();
}
@ -276,6 +276,9 @@ public class HTTP2Connection extends AbstractConnection implements WriteFlusher.
}
}
// Here we know that this.buffer is not retained:
// either it has been released, or it's a new one.
int filled = fill(getEndPoint(), buffer.buffer);
if (LOG.isDebugEnabled())
LOG.debug("Filled {} bytes in {}", filled, buffer);
@ -311,14 +314,10 @@ public class HTTP2Connection extends AbstractConnection implements WriteFlusher.
private void releaseNetworkBuffer()
{
if (!buffer.hasRemaining())
{
if (LOG.isDebugEnabled())
LOG.debug("Released {}", buffer);
buffer.release();
byteBufferPool.release(buffer.buffer);
buffer = null;
}
if (LOG.isDebugEnabled())
LOG.debug("Released {}", buffer);
buffer.recycle();
buffer = null;
}
@Override
@ -399,16 +398,31 @@ public class HTTP2Connection extends AbstractConnection implements WriteFlusher.
refCount.incrementAndGet();
}
@Override
public void succeeded()
private boolean release()
{
release();
return refCount.decrementAndGet() == 0;
}
@Override
public void failed(Throwable x)
public void succeeded()
{
release();
if (release())
{
if (LOG.isDebugEnabled())
LOG.debug("Released retained {}", this);
recycle();
}
}
@Override
public void failed(Throwable failure)
{
if (release())
{
if (LOG.isDebugEnabled())
LOG.debug("Released retained " + this, failure);
recycle();
}
}
@Override
@ -417,19 +431,9 @@ public class HTTP2Connection extends AbstractConnection implements WriteFlusher.
return InvocationType.NON_BLOCKING;
}
private void release()
private void recycle()
{
if (tryRelease())
{
byteBufferPool.release(buffer);
if (LOG.isDebugEnabled())
LOG.debug("Released retained {}", this);
}
}
private boolean tryRelease()
{
return refCount.decrementAndGet() == 0;
byteBufferPool.release(buffer);
}
@Override