github-forks
/
arthas
mirror of https://github.com/alibaba/arthas.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Release netty ByteBuf after use (#2835)

Browse Source
pull/2782/merge
CrazyCoder 6 months ago committed by GitHub
parent f84ab32660
commit cdb6efeca3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File

5
core/src/main/java/com/taobao/arthas/core/command/basic1000/Base64Command.java
Unescape Escape View File

@ -112,12 +112,12 @@ public class Base64Command extends AnnotatedCommand {
} }
InputStream input = null; InputStream input = null;
ByteBuf convertResult = null;
try { try {
input = new FileInputStream(f); input = new FileInputStream(f);
byte[] bytes = IOUtils.getBytes(input); byte[] bytes = IOUtils.getBytes(input);
ByteBuf convertResult = null;
if (this.decode) { if (this.decode) {
convertResult = Base64.decode(Unpooled.wrappedBuffer(bytes)); convertResult = Base64.decode(Unpooled.wrappedBuffer(bytes));
} else { } else {
@ -138,6 +138,9 @@ public class Base64Command extends AnnotatedCommand {
process.end(1, "read file error: " + e.getMessage()); process.end(1, "read file error: " + e.getMessage());
return; return;
} finally { } finally {
if (convertResult != null) {
convertResult.release();
}
IOUtils.close(input); IOUtils.close(input);
} }

22
tunnel-client/src/main/java/com/alibaba/arthas/tunnel/client/ProxyClient.java
Unescape Escape View File

@ -134,17 +134,25 @@ public class ProxyClient {
if (msg instanceof HttpContent) { if (msg instanceof HttpContent) {
HttpContent content = (HttpContent) msg; HttpContent content = (HttpContent) msg;
ByteBuf byteBuf = content.content(); ByteBuf byteBuf = null;
byte[] bytes = new byte[byteBuf.readableBytes()]; try{
byteBuf.readBytes(bytes); byteBuf = content.content();
byte[] bytes = new byte[byteBuf.readableBytes()];
byteBuf.readBytes(bytes);
simpleHttpResponse.setContent(bytes); simpleHttpResponse.setContent(bytes);
promise.setSuccess(simpleHttpResponse); promise.setSuccess(simpleHttpResponse);
if (content instanceof LastHttpContent) { if (content instanceof LastHttpContent) {
ctx.close(); ctx.close();
}
}finally {
if (byteBuf != null) {
byteBuf.release();
}
} }
} }
} }

29
tunnel-client/src/main/java/com/alibaba/arthas/tunnel/client/TunnelClientSocketClientHandler.java
Unescape Escape View File

@ -120,17 +120,24 @@ public class TunnelClientSocketClientHandler extends SimpleChannelInboundHandler
String targetUrl = targetUrls.get(0); String targetUrl = targetUrls.get(0);
SimpleHttpResponse simpleHttpResponse = proxyClient.query(targetUrl); SimpleHttpResponse simpleHttpResponse = proxyClient.query(targetUrl);
ByteBuf byteBuf = Base64 ByteBuf byteBuf = null;
.encode(Unpooled.wrappedBuffer(SimpleHttpResponse.toBytes(simpleHttpResponse))); try{
String requestData = byteBuf.toString(CharsetUtil.UTF_8); byteBuf = Base64
.encode(Unpooled.wrappedBuffer(SimpleHttpResponse.toBytes(simpleHttpResponse)));
QueryStringEncoder queryEncoder = new QueryStringEncoder(""); String requestData = byteBuf.toString(CharsetUtil.UTF_8);
queryEncoder.addParam(URIConstans.METHOD, MethodConstants.HTTP_PROXY);
queryEncoder.addParam(URIConstans.PROXY_REQUEST_ID, id); QueryStringEncoder queryEncoder = new QueryStringEncoder("");
queryEncoder.addParam(URIConstans.PROXY_RESPONSE_DATA, requestData); queryEncoder.addParam(URIConstans.METHOD, MethodConstants.HTTP_PROXY);
queryEncoder.addParam(URIConstans.PROXY_REQUEST_ID, id);
String url = queryEncoder.toString(); queryEncoder.addParam(URIConstans.PROXY_RESPONSE_DATA, requestData);
ctx.writeAndFlush(new TextWebSocketFrame(url));
String url = queryEncoder.toString();
ctx.writeAndFlush(new TextWebSocketFrame(url));
}finally {
if (byteBuf != null) {
byteBuf.release();
}
}
} }
} }

Write Preview
Loading…
Cancel
Save