From d86018ea4dc113f5619cfdd780739ebebb54932e Mon Sep 17 00:00:00 2001 From: tursom Date: Sat, 10 Jul 2021 01:33:18 +0800 Subject: [PATCH] update --- .../kotlin/cn/tursom/core/ThreadLocalSimpleDateFormat.kt | 2 ++ .../src/main/kotlin/cn/tursom/core/buffer/ByteBuffer.kt | 7 ++++--- .../kotlin/cn/tursom/core/pool/ExpandableMemoryPool.kt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ts-core/src/main/kotlin/cn/tursom/core/ThreadLocalSimpleDateFormat.kt b/ts-core/src/main/kotlin/cn/tursom/core/ThreadLocalSimpleDateFormat.kt index 38c5364..933b34f 100644 --- a/ts-core/src/main/kotlin/cn/tursom/core/ThreadLocalSimpleDateFormat.kt +++ b/ts-core/src/main/kotlin/cn/tursom/core/ThreadLocalSimpleDateFormat.kt @@ -12,6 +12,8 @@ class ThreadLocalSimpleDateFormat( fun format(date: Date) = get().format(date) fun parse(date: String) = get().parse(date) + fun now() = format(System.currentTimeMillis()) + companion object { val iso8601 = ThreadLocalSimpleDateFormat("YYYY-MM-dd'T'HH:mm:ssZZ") val standard = ThreadLocalSimpleDateFormat("YYYY-MM-dd HH:mm:ss") diff --git a/ts-core/ts-buffer/src/main/kotlin/cn/tursom/core/buffer/ByteBuffer.kt b/ts-core/ts-buffer/src/main/kotlin/cn/tursom/core/buffer/ByteBuffer.kt index 8e61ada..1e499f2 100644 --- a/ts-core/ts-buffer/src/main/kotlin/cn/tursom/core/buffer/ByteBuffer.kt +++ b/ts-core/ts-buffer/src/main/kotlin/cn/tursom/core/buffer/ByteBuffer.kt @@ -205,11 +205,12 @@ interface ByteBuffer : Closeable { array.forEachIndex(index, index + size - 1, this::put) } - fun put(inputStream: InputStream) { - if (hasArray) { + fun put(inputStream: InputStream): Int { + return if (hasArray) { val read = inputStream.read(array, writeOffset, writeable) - if (read < 0) throw IOException("stream closed") + if (read < 0) throw IOException("stream closed") writePosition += read + read } else { val buffer = ByteArray(10 * 1024) val read = inputStream.read(buffer) diff --git a/ts-core/ts-pool/src/main/kotlin/cn/tursom/core/pool/ExpandableMemoryPool.kt b/ts-core/ts-pool/src/main/kotlin/cn/tursom/core/pool/ExpandableMemoryPool.kt index b851c9e..9b6f3ca 100644 --- a/ts-core/ts-pool/src/main/kotlin/cn/tursom/core/pool/ExpandableMemoryPool.kt +++ b/ts-core/ts-pool/src/main/kotlin/cn/tursom/core/pool/ExpandableMemoryPool.kt @@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicBoolean /** * 可自动申请新内存空间的内存池 - * 线程安全 + * 线程安全依赖于poolFactory提供的内存池的线程安全性 */ class ExpandableMemoryPool( val maxPoolCount: Int = -1,