feedback

Author: 0marperez

runtime/runtime-core/api/runtime-core.api

@@ -1097,7 +1097,7 @@ public abstract interface class aws/smithy/kotlin/runtime/io/SdkSource : java/io
 
 public final class aws/smithy/kotlin/runtime/io/SdkSourceKt {
 	public static final fun readFully (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/io/SdkBuffer;J)V
-	public static final fun readRemaining (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/io/SdkBuffer;)V
+	public static final fun readRemaining (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/io/SdkBuffer;)J
 	public static final fun readToByteArray (Laws/smithy/kotlin/runtime/io/SdkSource;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun toSdkByteReadChannel (Laws/smithy/kotlin/runtime/io/SdkSource;Lkotlinx/coroutines/CoroutineScope;)Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;
 	public static synthetic fun toSdkByteReadChannel$default (Laws/smithy/kotlin/runtime/io/SdkSource;Lkotlinx/coroutines/CoroutineScope;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/io/SdkSource.kt

@@ -118,10 +118,15 @@ public fun SdkSource.readFully(sink: SdkBuffer, byteCount: Long) {
  * @param sink the buffer that data read from the source will be appended to
  */
 @InternalApi
-public fun SdkSource.readRemaining(sink: SdkBuffer) {
+public fun SdkSource.readRemaining(sink: SdkBuffer): Long {
+    var totalReadBytes: Long = 0
     var readBytes: Long
+
     do {
         // ensure any errors are propagated by attempting to read at least once
         readBytes = read(sink, Long.MAX_VALUE)
+        totalReadBytes += readBytes
     } while (readBytes != -1L)
+
+    return totalReadBytes + 1L // Account for last -1 read
 }