Merge pull request #1348 from jkobejs/don-not-return-whole-array

use only relative bulk get method
softwaremill · Mar 4, 2022 · 5aab54e · 5aab54e
2 parents 1fd17d9 + 248a996
commit 5aab54e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/core/src/main/scala/sttp/client3/internal/package.scala b/core/src/main/scala/sttp/client3/internal/package.scala
@@ -80,13 +80,9 @@ package object internal {
 
   implicit class RichByteBuffer(byteBuffer: ByteBuffer) {
     def safeRead(): Array[Byte] = {
-      if (byteBuffer.hasArray) {
-        byteBuffer.array()
-      } else {
-        val array = new Array[Byte](byteBuffer.remaining())
-        byteBuffer.get(array)
-        array
-      }
+      val array = new Array[Byte](byteBuffer.remaining())
+      byteBuffer.get(array)
+      array
     }
   }
 }
diff --git a/httpclient-backend/src/main/scala/sttp/client3/httpclient/WebSocketImpl.scala b/httpclient-backend/src/main/scala/sttp/client3/httpclient/WebSocketImpl.scala
@@ -105,12 +105,12 @@ private[httpclient] class AddToQueueListener[F[_]](
   }
 
   override def onPing(webSocket: JWebSocket, message: ByteBuffer): CompletionStage[_] = {
-    onFrame(WebSocketFrame.Ping(message.array()))
+    onFrame(WebSocketFrame.Ping(message.safeRead()))
     null
   }
 
   override def onPong(webSocket: JWebSocket, message: ByteBuffer): CompletionStage[_] = {
-    onFrame(WebSocketFrame.Pong(message.array()))
+    onFrame(WebSocketFrame.Pong(message.safeRead()))
     null
   }