@@ -23,6 +23,8 @@ class JRuby::Rack::Response b = "" @body.each {|part| b << part } b + ensure + @body.close if @body.respond_to?(:close) end def respond(response) @@ -75,6 +77,8 @@ class JRuby::Rack::Response # HACK: deal with objects that don't comply with Rack specification @body = [@body.to_s] retry + ensure + @body.close if @body.respond_to?(:close) end end end src/main/ruby/jruby/rack/response.rb @@ -115,4 +115,23 @@ describe JRuby::Rack::Response do @response.respond(@servlet_response) response.should == @servlet_response end + + it "#getBody should call close on the body if the body responds to close" do + @body.should_receive(:each).ordered.and_yield "hello" + @body.should_receive(:close).ordered + @response.getBody.should == "hello" + end + + it "#write_body should call close on the body if the body responds to close" do + @body.should_receive(:each).ordered.and_return do |block| + block.call "hello" + block.call "there" + end + @body.should_receive(:close).ordered + stream = mock "output stream" + @servlet_response.stub!(:getOutputStream).and_return stream + stream.should_receive(:write).exactly(2).times + + @response.write_body(@servlet_response) + end end src/spec/ruby/jruby/rack/response_spec.rb e173b4856e47afe2146642164b4eacf0baa52881 Nick Sieger nick@nicksieger.com http://github.com/nicksieger/jruby-rack/commit/61e44e49d11d44c19c75e55d67e0ae6214626b8e 61e44e49d11d44c19c75e55d67e0ae6214626b8e 2009-09-20T09:49:53-07:00 2009-09-20T09:49:53-07:00 JRUBY_RACK-22: Ensure we call #close on the body per the Rack spec a2eb33f2eed347da1b1d0302c96d1ff8b07955e2 Nick Sieger nick@nicksieger.com