Ensure the order of #close is consistent.

socketry · Oct 21, 2024 · 33d1faf · 33d1faf
1 parent df4d6d1
commit 33d1faf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/lib/protocol/http/body/completable.rb b/lib/protocol/http/body/completable.rb
@@ -33,12 +33,12 @@ def rewind
 				end
 
 				def close(error = nil)
-					super.tap do
-						if @callback
-							@callback.call(error)
-							@callback = nil
-						end
+					if @callback
+						@callback.call(error)
+						@callback = nil
 					end
+
+					super
 				end
 			end
 		end

diff --git a/test/protocol/http/body/completable.rb b/test/protocol/http/body/completable.rb
@@ -92,4 +92,18 @@
 			expect(completable.rewind).to be == false
 		end
 	end
+
+	with "#close" do
+		let(:events) {Array.new}
+		let(:callback) {Proc.new{events << :close}}
+
+		it "invokes callback once" do
+			completable1 = subject.new(body, proc{events << :close1})
+			completable2 = subject.new(completable1, proc{events << :close2})
+
+			completable2.close
+
+			expect(events).to be == [:close2, :close1]
+		end
+	end
 end