lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2018-08-04 23:40:52 +08:00
parent 115f91b64a
commit fd1197e8dc
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/org/redkale/net/Response.java
View File

@@ -251,6 +251,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
} }
this.recycleListener = null; this.recycleListener = null;
} }
if (request.more) removeChannel();
if (request.keepAlive && !request.more && channel != null) { if (request.keepAlive && !request.more && channel != null) {
if (channel.isOpen()) { if (channel.isOpen()) {
AsyncConnection conn = removeChannel(); AsyncConnection conn = removeChannel();
@@ -280,35 +281,43 @@ public abstract class Response<C extends Context, R extends Request<C>> {
public void finish(ByteBuffer buffer) { public void finish(ByteBuffer buffer) {
if (!this.inited) return; //避免重复关闭 if (!this.inited) return; //避免重复关闭
ByteBuffer data = this.request.removeMoredata(); ByteBuffer data = this.request.removeMoredata();
this.request.more = data != null && this.request.keepAlive; final AsyncConnection conn = this.channel;
this.channel.write(buffer, buffer, finishHandler); final boolean more = data != null && this.request.keepAlive;
if (this.request.more) new PrepareRunner(this.context, this.channel, data, null).run(); this.request.more = more;
conn.write(buffer, buffer, finishHandler);
if (more) new PrepareRunner(this.context, conn, data, null).run();
} }
public void finish(boolean kill, ByteBuffer buffer) { public void finish(boolean kill, ByteBuffer buffer) {
if (!this.inited) return; //避免重复关闭 if (!this.inited) return; //避免重复关闭
if (kill) refuseAlive(); if (kill) refuseAlive();
ByteBuffer data = this.request.removeMoredata(); ByteBuffer data = this.request.removeMoredata();
this.request.more = data != null && this.request.keepAlive; final AsyncConnection conn = this.channel;
this.channel.write(buffer, buffer, finishHandler); final boolean more = data != null && this.request.keepAlive;
if (this.request.more) new PrepareRunner(this.context, this.channel, data, null).run(); this.request.more = more;
conn.write(buffer, buffer, finishHandler);
if (more) new PrepareRunner(this.context, conn, data, null).run();
} }
public void finish(ByteBuffer... buffers) { public void finish(ByteBuffer... buffers) {
if (!this.inited) return; //避免重复关闭 if (!this.inited) return; //避免重复关闭
final AsyncConnection conn = this.channel;
ByteBuffer data = this.request.removeMoredata(); ByteBuffer data = this.request.removeMoredata();
this.request.more = data != null && this.request.keepAlive; final boolean more = data != null && this.request.keepAlive;
this.channel.write(buffers, buffers, finishHandler2); this.request.more = more;
if (this.request.more) new PrepareRunner(this.context, this.channel, data, null).run(); conn.write(buffers, buffers, finishHandler2);
if (more) new PrepareRunner(this.context, conn, data, null).run();
} }
public void finish(boolean kill, ByteBuffer... buffers) { public void finish(boolean kill, ByteBuffer... buffers) {
if (!this.inited) return; //避免重复关闭 if (!this.inited) return; //避免重复关闭
if (kill) refuseAlive(); if (kill) refuseAlive();
final AsyncConnection conn = this.channel;
ByteBuffer data = this.request.removeMoredata(); ByteBuffer data = this.request.removeMoredata();
this.request.more = data != null && this.request.keepAlive; final boolean more = data != null && this.request.keepAlive;
this.channel.write(buffers, buffers, finishHandler2); this.request.more = more;
if (this.request.more) new PrepareRunner(this.context, this.channel, data, null).run(); conn.write(buffers, buffers, finishHandler2);
if (more) new PrepareRunner(this.context, conn, data, null).run();
} }
protected <A> void send(final ByteBuffer buffer, final A attachment, final CompletionHandler<Integer, A> handler) { protected <A> void send(final ByteBuffer buffer, final A attachment, final CompletionHandler<Integer, A> handler) {