0
@@ -96,9 +96,12 @@ module ActiveSupport
0
       @guard.synchronize do
0
         unless buffer.empty?
0
           old_buffer = buffer
0
-          clear_buffer
0
           @log.write(old_buffer.join)
0
         end
0
+
0
+        # Important to do this even if buffer was empty or else @buffer will
0
+        # accumulate empty arrays for each request where nothing was logged.
0
+        clear_buffer
0
       end
0
     end
0
 

0
@@ -137,4 +137,10 @@ class BufferedLoggerTest < Test::Unit::TestCase
0
     assert @output.string.include?("a\nb\nc\n")
0
     assert @output.string.include?("x\ny\nz\n")
0
   end
0
+
0
+  def test_flush_should_remove_empty_buffers
0
+    @logger.send :buffer
0
+    @logger.expects :clear_buffer
0
+    @logger.flush
0
+  end
0
 end