Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NettyInputStream ByteBuf leak #4222

Merged
merged 5 commits into from
Aug 13, 2019
Merged

Fix NettyInputStream ByteBuf leak #4222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df91049
Fix NettyInputStream ByteBuf leak
Gbillou Aug 10, 2019
484a364
Fix ByteBuf leak in jersey/netty HTTP2 Handler too
Gbillou Aug 11, 2019
d0b6502
Copyright years bump to 2019
Gbillou Aug 12, 2019
75b57c2
Also fix read()
Gbillou Aug 12, 2019
4be4071
Rename arg
Gbillou Aug 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 14 additions & 26 deletions ...nnector/src/main/java/org/glassfish/jersey/netty/connector/internal/NettyInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -68,9 +68,11 @@ public NettyInputStream(LinkedBlockingDeque<InputStream> isList) {
this.isList = isList;
}

@Override
public int read(byte[] b, int off, int len) throws IOException {
private interface ISReader {
int readFrom(InputStream take) throws IOException;
}

private int readInternal(ISReader isReader) throws IOException {
if (end) {
return -1;
}
Expand All @@ -83,10 +85,12 @@ public int read(byte[] b, int off, int len) throws IOException {
return -1;
}

int read = take.read(b, off, len);
int read = isReader.readFrom(take);

Copy link
Contributor

Choose a reason for hiding this comment

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

could you please update copyright year in both files (to 2019) - copyright header at the top of each file?

Copy link
Contributor

Choose a reason for hiding this comment

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

thank you for changes, and a question - you are changing method read(byte[] b, int off, int len) but immediately under this method there is method read() without any parameters, but inner logic looks very similar, except the very reading. So, the question - shall InputStream take be closed as well in the read() method?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, I refactored the code a bit to avoid this mistake in the future.

if (take.available() > 0) {
isList.addFirst(take);
} else {
take.close();
}

return read;
Expand All @@ -96,29 +100,13 @@ public int read(byte[] b, int off, int len) throws IOException {
}

@Override
public int read() throws IOException {

if (end) {
return -1;
}

try {
InputStream take = isList.take();

if (checkEndOfInput(take)) {
return -1;
}

int read = take.read();

if (take.available() > 0) {
isList.addFirst(take);
}
public int read(byte[] b, int off, int len) throws IOException {
return readInternal(take -> take.read(b, off, len));
}

return read;
} catch (InterruptedException e) {
throw new IOException("Interrupted.", e);
}
@Override
public int read() throws IOException {
return readInternal(InputStream::read);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...ty-http/src/main/java/org/glassfish/jersey/netty/httpserver/JerseyHttp2ServerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -88,7 +88,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
* Process incoming data.
*/
private void onDataRead(ChannelHandlerContext ctx, Http2DataFrame data) throws Exception {
isList.add(new ByteBufInputStream(data.content()));
isList.add(new ByteBufInputStream(data.content(), true));
if (data.isEndStream()) {
isList.add(NettyInputStream.END_OF_INPUT);
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/JerseyServerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -100,7 +100,7 @@ public void run() {
ByteBuf content = httpContent.content();

if (content.isReadable()) {
isList.add(new ByteBufInputStream(content));
isList.add(new ByteBufInputStream(content, true));
}

if (msg instanceof LastHttpContent) {
Expand Down