ThreadPoolExecutor kill will wait_for_termination in JRuby; ensure TimerSet timer thread shuts down cleanly

Author: bensheldon

lib/concurrent-ruby/concurrent/executor/java_executor_service.rb

@@ -46,6 +46,7 @@ def shutdown
 defkill
 synchronizedo
 @executor.shutdownNow
+wait_for_termination
 nil
 end
 end

lib/concurrent-ruby/concurrent/executor/timer_set.rb

@@ -61,6 +61,7 @@ def post(delay, *args, &task)
 # not running.
 defkill
 shutdown
+@timer_executor.kill
 end
 
 private:<<
@@ -122,7 +123,9 @@ def remove_task(task)
 defns_shutdown_execution
 ns_reset_if_forked
 @queue.clear
-@timer_executor.kill
+@condition.set
+@condition.reset
+@timer_executor.shutdown
 stopped_event.set
 end
 

spec/concurrent/executor/timer_set_spec.rb

@@ -244,7 +244,7 @@ module Concurrent
 expect(task.schedule_time).toeqexpected
 end
 
-it'reschdules a pending and unpost task when given a valid time'do
+it'reschedules a pending and unpost task when given a valid time'do
 initial_delay=10
 rescheduled_delay=20
 task=subject.post(initial_delay){nil}