From 85dff20dd34303d46e6d43d375e373fe06e140f1 Mon Sep 17 00:00:00 2001 From: tursom Date: Sun, 15 Dec 2019 02:16:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8autoReturn=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=BF=94=E5=9B=9EByteBuffer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/cn/tursom/web/netty/NettyHttpContent.kt | 4 ++-- web/src/main/kotlin/cn/tursom/web/router/RoutedHttpHandler.kt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/netty-web/src/main/kotlin/cn/tursom/web/netty/NettyHttpContent.kt b/web/netty-web/src/main/kotlin/cn/tursom/web/netty/NettyHttpContent.kt index 09934ab..eeb557d 100644 --- a/web/netty-web/src/main/kotlin/cn/tursom/web/netty/NettyHttpContent.kt +++ b/web/netty-web/src/main/kotlin/cn/tursom/web/netty/NettyHttpContent.kt @@ -161,15 +161,15 @@ open class NettyHttpContent( } override fun finishChunked() { - writeChunkedHeader() finished = true + writeChunkedHeader() val httpChunkWriter = HttpChunkedInput(NettyChunkedByteBuffer(chunkedList)) ctx.writeAndFlush(httpChunkWriter) } override fun finishChunked(chunked: Chunked) { - writeChunkedHeader() finished = true + writeChunkedHeader() val httpChunkWriter = HttpChunkedInput(NettyChunkedInput(chunked)) ctx.writeAndFlush(httpChunkWriter) } diff --git a/web/src/main/kotlin/cn/tursom/web/router/RoutedHttpHandler.kt b/web/src/main/kotlin/cn/tursom/web/router/RoutedHttpHandler.kt index a399fe9..24b35fb 100644 --- a/web/src/main/kotlin/cn/tursom/web/router/RoutedHttpHandler.kt +++ b/web/src/main/kotlin/cn/tursom/web/router/RoutedHttpHandler.kt @@ -304,6 +304,7 @@ open class RoutedHttpHandler( if (doLog) log?.debug("{}: autoReturn: {}", content.clientIp, result) result ?: return when (result) { + is ByteBuffer -> content.finishText(result) is String -> content.finishText(result.toByteArray()) is StringBuilder -> content.finishText(result.toString().toByteArray()) is StringBuffer -> content.finishText(result.toString().toByteArray())