Update ByteStringInputStream.scala

apache · Apr 19, 2024 · b95c28f · b95c28f
1 parent 9aeb43c
commit b95c28f
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/.../src/main/scala/org/apache/pekko/http/impl/engine/http2/hpack/ByteStringInputStream.scala b/.../src/main/scala/org/apache/pekko/http/impl/engine/http2/hpack/ByteStringInputStream.scala
@@ -21,6 +21,7 @@ import scala.util.Try
 import org.apache.pekko
 import pekko.annotation.InternalApi
 import pekko.util.ByteString
+import pekko.util.ByteString.ByteString1C
 
 /** INTERNAL API */
 @InternalApi
@@ -36,6 +37,15 @@ private[http2] object ByteStringInputStream {
     byteStringInputStreamMethodTypeOpt.map { mh =>
       mh.invoke(bs).asInstanceOf[InputStream]
     }.getOrElse {
-      new ByteArrayInputStream(bs.toArrayUnsafe())
+      legacyConvert(bs)
     }
+
+  private def legacyConvert(bs: ByteString): InputStream =
+    bs match {
+      case cs: ByteString1C =>
+        new ByteArrayInputStream(cs.toArrayUnsafe())
+      case _ =>
+        // NOTE: We actually measured recently, and compact + use array was pretty good usually
+        apply(bs.compact)
+    }    
 }