Don't drain queue before executing members during shutdown

Author: billdueber

lib/concurrent/executor/ruby_thread_pool_executor.rb

@@ -172,7 +172,6 @@ def execute(*args, &task)
 
     # @!visibility private
     def shutdown_execution
-      @queue.clear
       if @pool.empty?
         stopped_event.set
       else

spec/concurrent/executor/thread_pool_shared.rb

@@ -100,6 +100,36 @@
     end
   end
 
+  context '#shutdown followed by #wait_for_termination' do
+    it "allows in-progress tasks to complete" do
+      @expected = false
+      subject.post{ sleep 0.1; @expected = true }
+      subject.shutdown
+      subject.wait_for_termination(1)
+      @expected.should be_true
+    end
+
+    it 'allows pending tasks to complete' do
+      @expected = false
+      subject.post{ sleep(0.1) }
+      subject.post{ sleep(0.1); @expected = true }
+      subject.shutdown
+      subject.wait_for_termination(1)
+      @expected.should be_true
+    end
+
+    it "stops accepting/running new tasks" do
+      @expected = :start
+      subject.post{ sleep(0.1) }
+      subject.post{ sleep(0.1); @expected = :should_be_run }
+      subject.shutdown
+      subject.post{ @expected = :should_not_be_run }
+      subject.wait_for_termination(1)
+      @expected.should == :should_be_run
+    end
+  end
+
+
   context '#kill' do
 
     it 'stops accepting new tasks' do