Author: kkolinko
Date: Sat Jun 9 13:31:02 2012
New Revision: 1348408
URL: http://svn.apache.org/viewvc?rev=1348408&view=rev
Log:
Merged revision 1348398 from tomcat/trunk:
Review of r1345026, comparing it with proposed patch for BZ 52955:
Add final modifiers to improve thread safety
Add BZ 52955 to changelog - it has been implemented in r1345026.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1348398
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1348408&r1=1348407&r2=1348408&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Sat
Jun 9 13:31:02 2012
@@ -1589,9 +1589,9 @@ public abstract class ContainerBase exte
}
private static class StartStopThreadFactory implements ThreadFactory {
- private ThreadGroup group;
- private AtomicInteger threadNumber = new AtomicInteger(1);
- private String namePrefix;
+ private final ThreadGroup group;
+ private final AtomicInteger threadNumber = new AtomicInteger(1);
+ private final String namePrefix;
public StartStopThreadFactory(String namePrefix) {
SecurityManager s = System.getSecurityManager();
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1348408&r1=1348407&r2=1348408&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jun 9 13:31:02 2012
@@ -60,6 +60,11 @@
<bug>52055</bug>: An additional fix to ensure that the
ChunkedInputFilter is correctly recycled. (markt)
</fix>
+ <update>
+ <bug>52955</bug>: Implement custom thread factory for container
+ start-stop thread pool. It allows to use daemon threads and give
+ them more distinct names. (kfujino)
+ </update>
<add>
<bug>53008</bug>: Additional test cases for BASIC authentication and
RFC2617 compliance. Patch provided by Brian Burch. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
