Skip to content

no need for ByteStreamInputStream #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

no need for ByteStreamInputStream #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .../src/main/scala/org/apache/pekko/http/impl/engine/http2/hpack/ByteStringInputStream.scala
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions ...re/src/main/scala/org/apache/pekko/http/impl/engine/http2/hpack/HeaderDecompression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,13 @@ private[http2] final class HeaderDecompression(masterHeaderParser: HttpHeaderPar
}
}
try {
decoder.decode(ByteStringInputStream(payload), Receiver)
val inputStream = payload.asInputStream
try {
decoder.decode(inputStream, Receiver)
} finally {
inputStream.close()
}
decoder.endHeaderBlock() // TODO: do we have to check the result here?

push(eventsOut, ParsedHeadersFrame(streamId, endStream, headers.result(), prioInfo))
} catch {
case ex: IOException =>
Expand Down
4 changes: 1 addition & 3 deletions ...tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameHpackSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package org.apache.pekko.http.impl.engine.http2

import org.apache.pekko
import pekko.http.impl.engine.http2.hpack.ByteStringInputStream
import pekko.http.scaladsl.model.headers.RawHeader
import pekko.http.scaladsl.model._
import pekko.http.shaded.com.twitter.hpack._
Expand Down Expand Up @@ -58,10 +57,9 @@ trait Http2FrameHpackSupport extends Http2FrameProbeDelegator with Http2FrameSen
val decoder = new Decoder(Http2Protocol.InitialMaxHeaderListSize, Http2Protocol.InitialMaxHeaderTableSize)

def decodeHeaders(bytes: ByteString): Seq[(String, String)] = {
val bis = ByteStringInputStream(bytes)
val hs = new VectorBuilder[(String, String)]()

decoder.decode(bis,
decoder.decode(bytes.asInputStream,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try finally

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is test code so I didn't think the close was as important

new HeaderListener {
def addHeader(name: String, value: String, parsedValue: AnyRef, sensitive: Boolean): AnyRef = {
hs += name -> value
Expand Down
Loading