HADOOP-9181. Merge 1429810 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429813 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-01-07 14:37:45 +00:00
parent 6a52f90017
commit 314e79bc2d
2 changed files with 4 additions and 0 deletions

View File

@ -216,6 +216,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-9153. Support createNonRecursive in ViewFileSystem. HADOOP-9153. Support createNonRecursive in ViewFileSystem.
(Sandy Ryza via tomwhite) (Sandy Ryza via tomwhite)
HADOOP-9181. Set daemon flag for HttpServer's QueuedThreadPool.
(Liang Xie via suresh)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -244,6 +244,7 @@ public class HttpServer implements FilterContainer {
// default value (currently 250). // default value (currently 250).
QueuedThreadPool threadPool = maxThreads == -1 ? QueuedThreadPool threadPool = maxThreads == -1 ?
new QueuedThreadPool() : new QueuedThreadPool(maxThreads); new QueuedThreadPool() : new QueuedThreadPool(maxThreads);
threadPool.setDaemon(true);
webServer.setThreadPool(threadPool); webServer.setThreadPool(threadPool);
final String appDir = getWebAppsPath(name); final String appDir = getWebAppsPath(name);