Skip to content

Commit 4aa49d3

Browse files
committed
revert change to repeated TOKEN_END
1 parent a190037 commit 4aa49d3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/stream.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,6 @@ const TOKEN_END = EndToken()
514514

515515
function Base.write(stream::TranscodingStream, ::EndToken)
516516
changemode!(stream, :write)
517-
if stream.state.code == :end
518-
callstartproc(stream, :write)
519-
end
520517
flushbufferall(stream)
521518
flushuntilend(stream)
522519
return 0

test/codecdoubleframe.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ DoubleFrameDecoderStream(stream::IO; kwargs...) = TranscodingStream(DoubleFrameD
228228
end == "[ HHeelllloo,, wwoorrlldd..\n\n ]"
229229
end
230230

231-
@testset "TOKEN_END repeated creates empty frames" begin
231+
@testset "TOKEN_END repeated doesn't create more empty frames" begin
232232
sink = IOBuffer()
233233
stream = TranscodingStream(DoubleFrameEncoder(), sink, stop_on_end=true)
234234
write(stream, TranscodingStreams.TOKEN_END)
@@ -237,9 +237,10 @@ DoubleFrameDecoderStream(stream::IO; kwargs...) = TranscodingStream(DoubleFrameD
237237
write(stream, TranscodingStreams.TOKEN_END)
238238
write(stream, "de")
239239
write(stream, TranscodingStreams.TOKEN_END)
240+
write(stream, "") # This doesn't create an empty frame
240241
write(stream, TranscodingStreams.TOKEN_END)
241242
close(stream)
242-
@test String(take!(sink)) == "[ ][ ][ aabbcc ][ ddee ][ ]"
243+
@test String(take!(sink)) == "[ ][ aabbcc ][ ddee ]"
243244
end
244245

245246
test_roundtrip_read(DoubleFrameEncoderStream, DoubleFrameDecoderStream)

0 commit comments

Comments
 (0)