Tidy up thread killing. Remove JRuby workaround.

guard · Aug 23, 2020 · 573aab1 · 573aab1
1 parent f72d44b
commit 573aab1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/lib/listen/adapter/base.rb b/lib/listen/adapter/base.rb
@@ -96,7 +96,9 @@ def self.usable?
       private
 
       def _stop
-        @run_thread.kill.join if (@run_thread ||= nil)
+        if thread = @run_thread
+          thread.kill.join
+        end
       end
 
       def _timed(title)

diff --git a/lib/listen/adapter/linux.rb b/lib/listen/adapter/linux.rb
@@ -97,15 +97,9 @@ def _dir_event?(event)
       end
 
       def _stop
-        @worker.close if (@worker ||= nil)
-
-        # You can't kill a thread that is doing a sysread in JRuby, so
-        # skip `join` and pray thread dies fast...
-        if RUBY_ENGINE == 'jruby'
-          @run_thread.kill if (@run_thread ||= nil)
-        else
-          super
-        end
+        @worker&.close
+
+        super
       end
     end
   end