| commit | f0940220c89e240e3af746c96cda5fed5305bb82 | [log] [tgz] |
|---|---|---|
| author | Kevin Clark <kclark@apache.org> | Wed Jun 18 01:20:13 2008 +0000 |
| committer | Kevin Clark <kclark@apache.org> | Wed Jun 18 01:20:13 2008 +0000 |
| tree | 2bf5775ba6a56da4bcd4e7a5eb7267e42ead05d1 | |
| parent | d8d0d603097dd6669f8d7d2c705959c189e052a2 [diff] |
rb: Fix the timeout used for joining threads when calling shutdown(timeout) on NonblockingServer git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@669040 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/lib/thrift/server/nonblockingserver.rb b/lib/rb/lib/thrift/server/nonblockingserver.rb index 70a58b5..f84a109 100644 --- a/lib/rb/lib/thrift/server/nonblockingserver.rb +++ b/lib/rb/lib/thrift/server/nonblockingserver.rb
@@ -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