From becb1bca3d50efa12fba393b68bb0d157ffc6f74 Mon Sep 17 00:00:00 2001
From: evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Thu, 18 Oct 2007 02:08:55 +0000
Subject: try joining the thread for JRuby so it blocks until it stops... this
 is confusing

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@681 19e92222-5c0b-0410-8929-a290d50e31e9
---
 lib/mongrel/configurator.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/mongrel/configurator.rb b/lib/mongrel/configurator.rb
index 867e89d..cd77b19 100644
--- a/lib/mongrel/configurator.rb
+++ b/lib/mongrel/configurator.rb
@@ -1,7 +1,6 @@
 require 'yaml'
 require 'etc'
 
-
 module Mongrel
   # Implements a simple DSL for configuring a Mongrel server for your 
   # purposes.  More used by framework implementers to setup Mongrel
@@ -290,7 +289,10 @@ module Mongrel
     # assumes that you don't want to restart.
     def stop(needs_restart=false)
       @listeners.each {|name,s| 
-        s.stop 
+        s.stop
+        
+        # XXX Try to get JRuby to wait for the thread to actually stop
+        s.acceptor.join 
       }
 
       @needs_restart = needs_restart
-- 
cgit v1.2.3-24-ge0c7