Merge pull request #695 from openziti/async-sock-handle-eof

ekoby · web-flow · commit 07cc9585897e · 2025-05-16T07:37:16.000-04:00
AsyncSocketImpl: properly handle EOF(-1)
diff --git a/ziti/src/main/kotlin/org/openziti/net/nio/AsyncSocketImpl.kt b/ziti/src/main/kotlin/org/openziti/net/nio/AsyncSocketImpl.kt
@@ -165,7 +165,11 @@ internal class AsyncSocketImpl(private val connector: Connector = DefaultConnect
                         runBlocking { readSuspend(input, to, TimeUnit.MILLISECONDS) }
                     }
                     input.flip()
-                    readCount.onSuccess { input.get(b, off, it) }
+                    readCount.onSuccess { c ->
+                        if (c > 0) {
+                            input.get(b, off, c)
+                        }
+                    }
                     inputLock.release()
                     return readCount.getOrElse { throwIOException(it) }
                 }

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,11 @@ internal class AsyncSocketImpl(private val connector: Connector = DefaultConnect`
`165`	`165`	`runBlocking { readSuspend(input, to, TimeUnit.MILLISECONDS) }`
`166`	`166`	`}`
`167`	`167`	`input.flip()`
`168`		`- readCount.onSuccess { input.get(b, off, it) }`
	`168`	`+ readCount.onSuccess { c ->`
	`169`	`+ if (c > 0) {`
	`170`	`+ input.get(b, off, c)`
	`171`	`+ }`
	`172`	`+ }`
`169`	`173`	`inputLock.release()`
`170`	`174`	`return readCount.getOrElse { throwIOException(it) }`
`171`	`175`	`}`