merged updates from billdueber

README.md

@@ -140,6 +140,7 @@ task.value #=> 25.96
 * [Ravil Bayramgalin](https://github.com/brainopia)
 * [Larry Lv](https://github.com/larrylv)
 * [Giuseppe Capizzi](https://github.com/gcapizzi)
+* [Bill Dueber](https://github.com/billdueber)
 * [Brian Shirai](https://github.com/brixen)
 * [Chip Miller](https://github.com/chip-miller)
 * [Jamie Hodge](https://github.com/jamiehodge)

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

lib/concurrent/executor/timer_set.rb

@@ -61,7 +61,12 @@ def post(intended_time, *args, &task)
 
     end
 
-    alias_method :kill, :shutdown
+    # For a timer, #kill is like an orderly shutdown, except we need to manually
+    # (and destructively) clear the queue first
+    def kill
+      @queue.clear
+      shutdown
+    end
 
     # Calculate an Epoch time with milliseconds at which to execute a
     # task. If the given time is a `Time` object it will be converted

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