revert change to repeated TOKEN_END

JuliaIO · Mar 10, 2024 · 4aa49d3 · 4aa49d3
1 parent a190037
commit 4aa49d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/stream.jl b/src/stream.jl
@@ -514,9 +514,6 @@ const TOKEN_END = EndToken()
 
 function Base.write(stream::TranscodingStream, ::EndToken)
     changemode!(stream, :write)
-    if stream.state.code == :end
-        callstartproc(stream, :write)
-    end
     flushbufferall(stream)
     flushuntilend(stream)
     return 0

diff --git a/test/codecdoubleframe.jl b/test/codecdoubleframe.jl
@@ -228,7 +228,7 @@ DoubleFrameDecoderStream(stream::IO; kwargs...) = TranscodingStream(DoubleFrameD
         end == "[ HHeelllloo,,  wwoorrlldd..\n\n ]"
     end
 
-    @testset "TOKEN_END repeated creates empty frames" begin
+    @testset "TOKEN_END repeated doesn't create more empty frames" begin
         sink = IOBuffer()
         stream = TranscodingStream(DoubleFrameEncoder(), sink, stop_on_end=true)
         write(stream, TranscodingStreams.TOKEN_END)
@@ -237,9 +237,10 @@ DoubleFrameDecoderStream(stream::IO; kwargs...) = TranscodingStream(DoubleFrameD
         write(stream, TranscodingStreams.TOKEN_END)
         write(stream, "de")
         write(stream, TranscodingStreams.TOKEN_END)
+        write(stream, "") # This doesn't create an empty frame
         write(stream, TranscodingStreams.TOKEN_END)
         close(stream)
-        @test String(take!(sink)) == "[  ][  ][ aabbcc ][ ddee ][  ]"
+        @test String(take!(sink)) == "[  ][ aabbcc ][ ddee ]"
     end
 
     test_roundtrip_read(DoubleFrameEncoderStream, DoubleFrameDecoderStream)