Skip to content

Commit

Permalink
Fix items disposition on pool overflow on JS and KN (ktorio/ktor#956)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Mashkov committed Feb 15, 2019
1 parent 7dca7f6 commit 1435028
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions js/src/kotlinx/io/pool/DefaultPool.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ actual abstract class DefaultPool<T : Any> actual constructor(actual final overr

actual final override fun recycle(instance: T) {
validateInstance(instance)
if (size == capacity) disposeInstance(instance)
instances[size++] = instance
if (size == capacity) {
disposeInstance(instance)
} else {
instances[size++] = instance
}
}

actual final override fun dispose() {
Expand Down
7 changes: 5 additions & 2 deletions native/src/kotlinx/io/pool/DefaultPool.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ actual abstract class DefaultPool<T : Any> actual constructor(actual override fi

actual final override fun recycle(instance: T) {
validateInstance(instance)
if (size == capacity) disposeInstance(instance)
instances[size++] = instance
if (size == capacity) {
disposeInstance(instance)
} else {
instances[size++] = instance
}
}

actual final override fun dispose() {
Expand Down

0 comments on commit 1435028

Please sign in to comment.