Author: kclark
Date: Tue Jun 17 18:20:13 2008
New Revision: 669040
URL: http://svn.apache.org/viewvc?rev=669040&view=rev
Log:
rb: Fix the timeout used for joining threads when calling shutdown(timeout) on
NonblockingServer
Modified:
incubator/thrift/trunk/lib/rb/lib/thrift/server/nonblockingserver.rb
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/server/nonblockingserver.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/server/nonblockingserver.rb?rev=669040&r1=669039&r2=669040&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/server/nonblockingserver.rb
(original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/server/nonblockingserver.rb Tue
Jun 17 18:20:13 2008
@@ -197,7 +197,7 @@
start = Time.now
@worker_threads.each do |t|
if shutdown_timeout > 0
- timeout = Time.now - (start + shutdown_timeout)
+ timeout = (start + shutdown_timeout) - Time.now
break if timeout <= 0
t.join(timeout)
else
