You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2007/03/16 20:56:06 UTC
svn commit: r519115 -
/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: fhanik
Date: Fri Mar 16 12:56:05 2007
New Revision: 519115
URL: http://svn.apache.org/viewvc?view=rev&rev=519115
Log:
minor tweaks
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diff&rev=519115&r1=519114&r2=519115
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Mar 16 12:56:05 2007
@@ -712,7 +712,7 @@
executor = new ThreadPoolExecutor(getMinSpareThreads(), getMaxThreads(), 60, TimeUnit.SECONDS,taskqueue, tf);
taskqueue.setParent( (ThreadPoolExecutor) executor);
}
- } else {
+ } else if ( executor != null ) {//avoid two thread pools being created
workers = new WorkerStack(maxThreads);
}
@@ -1898,7 +1898,7 @@
}
public boolean offer(Runnable o) {
- if ( parent != null && parent.getPoolSize()<parent.getMaximumPoolSize() ) return false;
+ if ( parent != null && parent.getPoolSize()<parent.getMaximumPoolSize() ) return false;//force creation of new threads
else return super.offer(o);
}
}
@@ -1917,7 +1917,7 @@
public Thread newThread(Runnable r) {
Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement());
- t.setDaemon(true);
+ t.setDaemon(daemon);
t.setPriority(getThreadPriority());
return t;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org