tursom/TursomServer
0
0
Fork 0
mirror of https://github.com/tursom/TursomServer.git synced 2025-01-06 10:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复 ByteBuffer.finishWrite 的 bug

Browse Source
This commit is contained in:
tursom 2019-12-14 23:56:27 +08:00
parent 5f1f116b39
commit e41da3463a
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/cn/tursom/core/buffer/ByteBuffer.kt
View File

@ -60,7 +60,7 @@ interface ByteBuffer : Closeable {
fun writeBuffer(): java.nio.ByteBuffer
fun finishWrite(buffer: java.nio.ByteBuffer) {
readPosition = buffer.position()
writePosition = buffer.position()
}
fun reset()

2
web/netty-web/src/main/kotlin/cn/tursom/web/netty/NettyHttpContent.kt
View File

@ -161,12 +161,14 @@ open class NettyHttpContent(
}
override fun finishChunked() {
writeChunkedHeader()
finished = true
val httpChunkWriter = HttpChunkedInput(NettyChunkedByteBuffer(chunkedList))
ctx.writeAndFlush(httpChunkWriter)
}
override fun finishChunked(chunked: Chunked) {
writeChunkedHeader()
finished = true
val httpChunkWriter = HttpChunkedInput(NettyChunkedInput(chunked))
ctx.writeAndFlush(httpChunkWriter)

12
web/src/main/kotlin/cn/tursom/web/router/RoutedHttpHandler.kt
View File

@ -7,17 +7,16 @@ import cn.tursom.web.ExceptionContent
import cn.tursom.web.HttpContent
import cn.tursom.web.HttpHandler
import cn.tursom.web.MutableHttpContent
import cn.tursom.web.router.impl.SimpleRouter
import cn.tursom.web.mapping.*
import cn.tursom.web.result.Html
import cn.tursom.web.result.Json
import cn.tursom.web.result.Text
import cn.tursom.web.router.impl.SimpleRouter
import cn.tursom.web.utils.Chunked
import org.slf4j.LoggerFactory
import java.io.File
import java.io.RandomAccessFile
import java.lang.reflect.Method
import kotlin.reflect.KCallable
/**
* 自动添加路径映射的处理器
@ -66,7 +65,7 @@ open class RoutedHttpHandler(
return@forEach
}
}
log?.debug("mapping {} {}", method, method.parameterTypes)
log?.trace("mapping {} {}", method, method.parameterTypes)
insertMapping(handler, method)
}
}
@ -101,9 +100,8 @@ open class RoutedHttpHandler(
protected fun insertMapping(obj: Any, method: Method) {
val mapping = obj::class.java.getAnnotation(Mapping::class.java)?.route ?: arrayOf("")
method.annotations.forEach { annotation ->
log?.info("method route {} annotation {}", method, annotation)
val (routes, router) = getRoutes(annotation) ?: return@forEach
log?.info("method route {} mapped to {}", method, routes)
log?.info("mapping {} => {}", routes, method)
routes.forEach { route ->
if (mapping.isEmpty()) {
addRouter(obj, method, route, router)
@ -159,12 +157,12 @@ open class RoutedHttpHandler(
@Suppress("LeakingThis")
val clazz = handler.javaClass
clazz.methods.forEach { method ->
log?.debug("try mapping {}", method)
method.parameterTypes.let {
if (!(it.size == 1 && HttpContent::class.java.isAssignableFrom(it[0])) && it.isNotEmpty()) {
return@forEach
}
}
log?.debug("delete mapping {}", method)
deleteMapping(handler, method)
}
}
@ -174,7 +172,7 @@ open class RoutedHttpHandler(
method.annotations.forEach { annotation ->
val (routes, router) = getRoutes(annotation) ?: return@forEach
routes.forEach { route ->
log?.info("delete route {} mapped to {}", route, method)
log?.info("delete route {} => {}", route, method)
if (mapping.isEmpty()) {
deleteMapping(obj, route, router)
} else mapping.forEach {

5
web/web-coroutine/src/main/kotlin/cn/tursom/web/router/AsyncRoutedHttpHandler.kt
View File

@ -75,7 +75,7 @@ open class AsyncRoutedHttpHandler(
return@forEach
}
}
log?.debug("mapping {} {}", member, member.parameters)
log?.trace("mapping {} {}", member, member.parameters)
insertMapping(handler, member)
}
}
@ -84,10 +84,9 @@ open class AsyncRoutedHttpHandler(
protected fun insertMapping(obj: Any, method: KCallable<*>) {
val mapping = obj::class.java.getAnnotation(Mapping::class.java)?.route ?: arrayOf("")
method.annotations.forEach { annotation ->
log?.info("method route {} annotation {}", method, annotation)
val (routes, router) = getAsyncRoutes(annotation) ?: return@forEach
@Suppress("DuplicatedCode")
log?.info("method route {} mapped to {}", method, routes)
log?.info("mapping {} => {}", routes, method)
routes.forEach { route ->
if (mapping.isEmpty()) {
addRouter(obj, method, route, router)