tomcat7.0
14 years agoImprove MimeHeaders.toString() (is used only for debugging):
kkolinko [Thu, 29 Sep 2011 00:29:35 +0000 (00:29 +0000)]
Improve MimeHeaders.toString() (is used only for debugging):
if there are several headers with the same name, print all of them.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1177125 13f79535-47bb-0310-9956-ffa450edef68

14 years agoImprove TestNonBlockingCoordinator:
kkolinko [Wed, 28 Sep 2011 21:03:09 +0000 (21:03 +0000)]
Improve TestNonBlockingCoordinator:
- Format code for better readbility.
- In testCoord1() change how equality is tested. Read expected value from 0th member, instead of (i-1)th. They all should be the same.
- Remove unneeded main() method.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1177060 13f79535-47bb-0310-9956-ffa450edef68

14 years agoImprove TestGroupChannelMemberArrival
kkolinko [Wed, 28 Sep 2011 20:36:42 +0000 (20:36 +0000)]
Improve TestGroupChannelMemberArrival
1. Add synchronization when accessing TestMbrListener.members.
This should fix the failures observed by Gump.
2. Remove unused method #clear().
3. Improve messages printed to System.out during the test:
- Add timestamps
- Add hash code of threads (because thread names are not unique: They all are either "Membership-MemberAdded." or "Membership-MemberDisappeared.").
- Add current length of members list
4. Print messages when memberAdded()/memberDisappeared() performed no work.
That is if notification arrives twice for the same Member. I have not observed such events when running the tests.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1177050 13f79535-47bb-0310-9956-ffa450edef68

14 years agoIn the examples application:
kkolinko [Wed, 28 Sep 2011 11:45:22 +0000 (11:45 +0000)]
In the examples application:
Add links to the FORM Auth, Servlet 3.0 Async and Comet examples.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1176833 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51905
kkolinko [Wed, 28 Sep 2011 09:35:59 +0000 (09:35 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51905
Skip attempt to shutdown AprEndpoint acceptor threads if the server socket has been already forcefully closed.
Reduce waiting timeout from 30s to 10s. I think if things go wrong 10s is enough to wait.

If it were waiting 30s
- the JVM itself might be forcefully closed by service wrapper as unresponsive.
- it must print something to the logs, otherwise it looks odd.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1176799 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
markt [Tue, 27 Sep 2011 20:15:41 +0000 (20:15 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
Ensure access log always logs the correct remote IP.
Ensure requests with multiple errors do not result in multiple access log entries.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1176590 13f79535-47bb-0310-9956-ffa450edef68

14 years agoContainerServlets are always restricted.
markt [Tue, 27 Sep 2011 20:08:59 +0000 (20:08 +0000)]
ContainerServlets are always restricted.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1176584 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd to the Tomcat 8 TODOs
markt [Mon, 26 Sep 2011 16:15:25 +0000 (16:15 +0000)]
Add to the Tomcat 8 TODOs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175933 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix a FindBugs warning
markt [Mon, 26 Sep 2011 15:32:07 +0000 (15:32 +0000)]
Fix a FindBugs warning

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175907 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix some FindBugs warnings
markt [Mon, 26 Sep 2011 14:59:59 +0000 (14:59 +0000)]
Fix some FindBugs warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175896 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused code
markt [Mon, 26 Sep 2011 14:44:48 +0000 (14:44 +0000)]
Remove unused code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175889 13f79535-47bb-0310-9956-ffa450edef68

14 years agoImprove RUNNING.txt by adding the following:
kkolinko [Mon, 26 Sep 2011 11:14:23 +0000 (11:14 +0000)]
Improve RUNNING.txt by adding the following:
- Mention that CATALINA_HOME should have a correct value or be absent (BZ 51806)
- Mention environment variables that are used by the scripts.
- Document what is left in $CATALINA_HOME when $CATALINA_BASE is used.
- Document setenv.* scripts.

Feedback and better wording are welcome.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175798 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd thread name to OneLineFormatter.
rjung [Mon, 26 Sep 2011 08:39:05 +0000 (08:39 +0000)]
Add thread name to OneLineFormatter.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175713 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50923
kkolinko [Mon, 26 Sep 2011 06:38:51 +0000 (06:38 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50923
Use slightly different color for <code> tags

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175690 13f79535-47bb-0310-9956-ffa450edef68

14 years agoThere is a caveat when using RemoteAddrValve with IPv6 addresses
kkolinko [Mon, 26 Sep 2011 00:24:20 +0000 (00:24 +0000)]
There is a caveat when using RemoteAddrValve with IPv6 addresses
- see thread "tomcat 7.0.21: bug in RemoteAddrValve?" of 2011-09-14 on users@
Document it and update configuration examples in manager and host-manager apps.
Add usage examples to valve.html, filter.html.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175633 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUse slightly more correct markup:
kkolinko [Sun, 25 Sep 2011 22:46:45 +0000 (22:46 +0000)]
Use slightly more correct markup:
<h1> is block element, while <font> is inline element

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175613 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate version number for Tomcat 8.
kkolinko [Sun, 25 Sep 2011 22:36:08 +0000 (22:36 +0000)]
Update version number for Tomcat 8.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175612 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused webapps/docs/tribes/tomcat-docs.xsl
kkolinko [Sun, 25 Sep 2011 22:21:17 +0000 (22:21 +0000)]
Remove unused webapps/docs/tribes/tomcat-docs.xsl

The build.xml that does "xslt basedir="webapps/docs/tribes"" uses
the common webapps/docs/tomcat-docs.xsl instead.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175602 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate version number to Tomcat 8, where it was added by r962466
kkolinko [Sun, 25 Sep 2011 22:06:57 +0000 (22:06 +0000)]
Update version number to Tomcat 8, where it was added by r962466

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175597 13f79535-47bb-0310-9956-ffa450edef68

14 years agoDon't send 503 if endpoint is paused and we
rjung [Sun, 25 Sep 2011 21:54:13 +0000 (21:54 +0000)]
Don't send 503 if endpoint is paused and we
just answered an AJP CPING.

If CPING works, mod_jk expects the main request
to work too. If we don't want to process the
main request we need to fail the CPING received
directly before.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175594 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd 503 return in process() when endpoint is paused.
rjung [Sun, 25 Sep 2011 21:48:25 +0000 (21:48 +0000)]
Add 503 return in process() when endpoint is paused.
This is consistent with BIO and NIO.
Some more whitespace and other non-functional
changes to align with AjpNioProcessor.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175590 13f79535-47bb-0310-9956-ffa450edef68

14 years agoWhitespace change to align with AjpAprProcessor.
rjung [Sun, 25 Sep 2011 21:46:49 +0000 (21:46 +0000)]
Whitespace change to align with AjpAprProcessor.
No functional change.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175589 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51871
kkolinko [Sun, 25 Sep 2011 21:25:11 +0000 (21:25 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51871
Wrong transitive dependency listed in tomcat-jdbc maven pom
It should depend on tomcat-juli, not on itself.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175582 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCleanup temporary files created by tests:
kkolinko [Sat, 24 Sep 2011 23:31:04 +0000 (23:31 +0000)]
Cleanup temporary files created by tests:
register them and delete them in tearDown().
In TestRegistration also aligned mkdir calls with their usage elsewhere.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175283 13f79535-47bb-0310-9956-ffa450edef68

14 years agoReduce visibility of static field ManagerBase.name and make it final.
kkolinko [Sat, 24 Sep 2011 22:30:59 +0000 (22:30 +0000)]
Reduce visibility of static field ManagerBase.name and make it final.
We already had a bug being introduced in r1174181 because of this field being assignable.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175275 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCorrect a typo
kkolinko [Sat, 24 Sep 2011 22:13:37 +0000 (22:13 +0000)]
Correct a typo

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175272 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51887
markt [Sat, 24 Sep 2011 17:20:21 +0000 (17:20 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51887
Use an insecure random source for session ID generation during tests for speed.
Based on kkolinko's suggestion.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175201 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix Javadoc typo.
rjung [Sat, 24 Sep 2011 16:31:27 +0000 (16:31 +0000)]
Fix Javadoc typo.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175190 13f79535-47bb-0310-9956-ffa450edef68

14 years agoBreak from AJP CPING handling if endpoint is
rjung [Sat, 24 Sep 2011 15:57:03 +0000 (15:57 +0000)]
Break from AJP CPING handling if endpoint is
already paused.

Experimenting shows, that we will otherwise
loose the following request. TC will not
answer it, but mod_jk doesn't resend if properly
configured. CPING is meant to detect this.

Not 100% sure about the call to recycle(),
but didn't find where else it would happen.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175182 13f79535-47bb-0310-9956-ffa450edef68

14 years agoDo not try to delete the whole output/test-tmp subdirectory when running tests,
kkolinko [Sat, 24 Sep 2011 13:39:44 +0000 (13:39 +0000)]
Do not try to delete the whole output/test-tmp subdirectory when running tests,
because that wouldn't succeed (at least on Windows).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175167 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd Override annotation to recently added methods.
rjung [Sat, 24 Sep 2011 11:13:01 +0000 (11:13 +0000)]
Add Override annotation to recently added methods.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175158 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUse setters when cloning attributes.
rjung [Sat, 24 Sep 2011 11:02:41 +0000 (11:02 +0000)]
Use setters when cloning attributes.
Should be more safe in most cases.

Example: setting name directly was wrong,
because name in base class was something else
then in the sub classes.

Not using the setter for maxActiveSessions,
because it will also call property change
listeners.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175155 13f79535-47bb-0310-9956-ffa450edef68

14 years agoIgnore warnings in classes generated with JavaCC/JJTree
kkolinko [Fri, 23 Sep 2011 19:55:27 +0000 (19:55 +0000)]
Ignore warnings in classes generated with JavaCC/JJTree

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174983 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd links to @SuppressWarnings documentation for Eclipse IDE.
kkolinko [Fri, 23 Sep 2011 19:46:19 +0000 (19:46 +0000)]
Add links to @SuppressWarnings documentation for Eclipse IDE.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174975 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix SSL + BIO + Java 7
markt [Fri, 23 Sep 2011 16:58:50 +0000 (16:58 +0000)]
Fix SSL + BIO + Java 7
The implementation of InputStream.read(byte[0]) has changed so it always returns zero without checking for EOF. This broke the old way of doing things.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174884 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUse the StringManager for i18n
markt [Fri, 23 Sep 2011 16:55:21 +0000 (16:55 +0000)]
Use the StringManager for i18n

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174882 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix FindBugs warning
markt [Fri, 23 Sep 2011 14:23:40 +0000 (14:23 +0000)]
Fix FindBugs warning

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174799 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51862
slaurent [Thu, 22 Sep 2011 20:01:52 +0000 (20:01 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51862
bug 51862: JreMemoryLeakPreventionListener enhancement to load configurable classes
https://issues.apache.org/bugzilla/show_bug.cgi?id=51862

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174353 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix Eclipse warnings
markt [Thu, 22 Sep 2011 19:41:32 +0000 (19:41 +0000)]
Fix Eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174343 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove some unused code
markt [Thu, 22 Sep 2011 19:37:57 +0000 (19:37 +0000)]
Remove some unused code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174341 13f79535-47bb-0310-9956-ffa450edef68

14 years agoSuppress warning that is hard (impossible?) to avoid
markt [Thu, 22 Sep 2011 19:36:54 +0000 (19:36 +0000)]
Suppress warning that is hard (impossible?) to avoid

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174339 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused code
markt [Thu, 22 Sep 2011 19:34:16 +0000 (19:34 +0000)]
Remove unused code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174338 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused code
markt [Thu, 22 Sep 2011 19:33:03 +0000 (19:33 +0000)]
Remove unused code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174337 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unnecessary code
markt [Thu, 22 Sep 2011 19:21:19 +0000 (19:21 +0000)]
Remove unnecessary code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174330 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRevert r1174322 and apply the correct fix
markt [Thu, 22 Sep 2011 19:19:16 +0000 (19:19 +0000)]
Revert r1174322 and apply the correct fix

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174329 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix a small number of Eclipse warnings.
markt [Thu, 22 Sep 2011 19:12:01 +0000 (19:12 +0000)]
Fix a small number of Eclipse warnings.
 - Unused code
 - Unnecessary null checks

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174325 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix Eclipse warning - unused throws
markt [Thu, 22 Sep 2011 19:06:52 +0000 (19:06 +0000)]
Fix Eclipse warning - unused throws

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174322 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix docs typo.
rjung [Thu, 22 Sep 2011 16:08:33 +0000 (16:08 +0000)]
Fix docs typo.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174239 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix running under a security manager
markt [Thu, 22 Sep 2011 11:21:08 +0000 (11:21 +0000)]
Fix running under a security manager

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1174061 13f79535-47bb-0310-9956-ffa450edef68

14 years agoReplace explicit Tomcat version with a template - for Tomcat 8.
kkolinko [Wed, 21 Sep 2011 22:12:36 +0000 (22:12 +0000)]
Replace explicit Tomcat version with a template - for Tomcat 8.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173892 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFollowup to r1173630
kkolinko [Wed, 21 Sep 2011 15:35:47 +0000 (15:35 +0000)]
Followup to r1173630
Simplify code: methodName can be tested once per iteration

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173722 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51860
markt [Wed, 21 Sep 2011 14:14:22 +0000 (14:14 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51860
Fix issues when using NIO, SSL and a custom SSLImplementation.
Based on a suggestion by Roman Tsirulnikov.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173659 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51852
markt [Wed, 21 Sep 2011 13:33:51 +0000 (13:33 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51852
Correct 2 issues in varargs handling
 - Incorrectly constructed varargs arguments (resulting in
ArrayIndexOutOfBoundsExceptions)
 - Incorrectly detected matching varargs methods
Patch (with a test case!) provided by Matt Benson

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173630 13f79535-47bb-0310-9956-ffa450edef68

14 years agoSimplify code in NioEndpoint$Poller.
kkolinko [Wed, 21 Sep 2011 13:14:29 +0000 (13:14 +0000)]
Simplify code in NioEndpoint$Poller.
The events.size() call is costly, because it is a loop that counts entries in a linked queue.
Actually it is not needed here at all, because we iterate the queue by ourselves.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173614 13f79535-47bb-0310-9956-ffa450edef68

14 years agofollowup r1173088 and r1173090.
kfujino [Wed, 21 Sep 2011 02:07:24 +0000 (02:07 +0000)]
followup r1173088 and r1173090.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173461 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFixed bug #51580: Severe error deploying WAR application (ExpandWar error)
schultz [Tue, 20 Sep 2011 20:30:10 +0000 (20:30 +0000)]
Fixed bug #51580: Severe error deploying WAR application (ExpandWar error)
- Added error mesage when JarEntry InputStream cannot be found due to a broken WAR file

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173342 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFixed bug #51687: Improve JreMemoryLeakPreventionListener against leak caused by...
schultz [Tue, 20 Sep 2011 20:17:23 +0000 (20:17 +0000)]
Fixed bug #51687: Improve JreMemoryLeakPreventionListener against leak caused by sun.java2d.Disposer
- Added (optional) protection against sun.java2d.Disposer thread pinning a WebappClassLoader into memory in the JreMemoryLeakPreventionListener.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173333 13f79535-47bb-0310-9956-ffa450edef68

14 years agoModify test to account for behaviours of different platforms and different connectors.
markt [Tue, 20 Sep 2011 18:17:06 +0000 (18:17 +0000)]
Modify test to account for behaviours of different platforms and different connectors.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173288 13f79535-47bb-0310-9956-ffa450edef68

14 years agoEnsure that when the connector is stopped that a Comet END event is processed to...
markt [Tue, 20 Sep 2011 17:08:41 +0000 (17:08 +0000)]
Ensure that when the connector is stopped that a Comet END event is processed to signal to the app and to close the socket

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173256 13f79535-47bb-0310-9956-ffa450edef68

14 years ago5s is plenty when things are working and 10s is too long when they aren't.
markt [Tue, 20 Sep 2011 16:46:17 +0000 (16:46 +0000)]
5s is plenty when things are working and 10s is too long when they aren't.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173241 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRevert accidental commit
markt [Tue, 20 Sep 2011 11:54:44 +0000 (11:54 +0000)]
Revert accidental commit

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173096 13f79535-47bb-0310-9956-ffa450edef68

14 years ago- Pull up common clode code to base class.
rjung [Tue, 20 Sep 2011 11:36:29 +0000 (11:36 +0000)]
- Pull up common clode code to base class.
- Add sessionAttributeFilter to clone method
- Reduce visibility of notifyListenersOnReplication

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173090 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPull up members "cluster" and "notifyListenersOnReplication"
rjung [Tue, 20 Sep 2011 11:32:49 +0000 (11:32 +0000)]
Pull up members "cluster" and "notifyListenersOnReplication"
to common base class.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173088 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove empty comment
markt [Tue, 20 Sep 2011 11:02:41 +0000 (11:02 +0000)]
Remove empty comment

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173082 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove debug use of System.out
markt [Tue, 20 Sep 2011 08:36:18 +0000 (08:36 +0000)]
Remove debug use of System.out
Add missing volatile

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173021 13f79535-47bb-0310-9956-ffa450edef68

14 years agoBetter detection of thread termination at end of test
markt [Tue, 20 Sep 2011 08:33:44 +0000 (08:33 +0000)]
Better detection of thread termination at end of test
Better failure messages so it is easier to see the cause of any failure immediately

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1173020 13f79535-47bb-0310-9956-ffa450edef68

14 years agoDon't add to Poller when socket is closing to prevent NPEs.
markt [Mon, 19 Sep 2011 17:14:10 +0000 (17:14 +0000)]
Don't add to Poller when socket is closing to prevent NPEs.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172711 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix threading issue with changing visibility of methods and fields
markt [Mon, 19 Sep 2011 16:30:36 +0000 (16:30 +0000)]
Fix threading issue with changing visibility of methods and fields

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172689 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix resource leak in annotations cache that prevented unloading of resources that...
markt [Mon, 19 Sep 2011 15:31:43 +0000 (15:31 +0000)]
Fix resource leak in annotations cache that prevented unloading of resources that used annotations

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172664 13f79535-47bb-0310-9956-ffa450edef68

14 years agoJSP unloading code was retaining a reference to the unloaded JSP preventing the assoc...
markt [Mon, 19 Sep 2011 13:19:27 +0000 (13:19 +0000)]
JSP unloading code was retaining a reference to the unloaded JSP preventing the associated class from being unloaded until the JSP that replaced it was unloaded.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172610 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAlways process postConstruct / preDestroy annotations but only process resource annot...
markt [Mon, 19 Sep 2011 10:11:44 +0000 (10:11 +0000)]
Always process postConstruct / preDestroy annotations but only process resource annotations if JNDI is enabled.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172556 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRevert previous commit (r1172546). Need to fix cause rather than symptom.
markt [Mon, 19 Sep 2011 10:04:37 +0000 (10:04 +0000)]
Revert previous commit (r1172546). Need to fix cause rather than symptom.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172550 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPrevent NPE if JNDI is disabled.
markt [Mon, 19 Sep 2011 10:00:04 +0000 (10:00 +0000)]
Prevent NPE if JNDI is disabled.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172546 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd two new Java 7 Jars to jarsToSkip.
rjung [Sun, 18 Sep 2011 13:30:12 +0000 (13:30 +0000)]
Add two new Java 7 Jars to jarsToSkip.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172282 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix javadoc and comment typo.
rjung [Sun, 18 Sep 2011 13:04:25 +0000 (13:04 +0000)]
Fix javadoc and comment typo.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172278 13f79535-47bb-0310-9956-ffa450edef68

14 years agoBZ 51811: Fix typo in attribute name
rjung [Sun, 18 Sep 2011 12:22:39 +0000 (12:22 +0000)]
BZ 51811: Fix typo in attribute name
(sslImplementationName instead of
 sslImplemenationName).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172269 13f79535-47bb-0310-9956-ffa450edef68

14 years agoDocument new "sessionAttributeFilter" for cluster
rjung [Sun, 18 Sep 2011 09:33:21 +0000 (09:33 +0000)]
Document new "sessionAttributeFilter" for cluster
managers.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172236 13f79535-47bb-0310-9956-ffa450edef68

14 years agoSupport a regexp based filter of attribute
rjung [Sun, 18 Sep 2011 09:21:24 +0000 (09:21 +0000)]
Support a regexp based filter of attribute
names in ClusterManagerBase and DeltaSession.

Only attributes whose names match will be
distributed. An empty filter means all attributes
will be distributed (unchanged default behaviour).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172234 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAllow to overwrite check for distributability
rjung [Sun, 18 Sep 2011 09:20:00 +0000 (09:20 +0000)]
Allow to overwrite check for distributability
of session attributes by session implementations.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172233 13f79535-47bb-0310-9956-ffa450edef68

14 years agoReport tests failure only after all three variants (BIO,NIO,APR) have been run. Do...
kkolinko [Fri, 16 Sep 2011 17:46:35 +0000 (17:46 +0000)]
Report tests failure only after all three variants (BIO,NIO,APR) have been run. Do not stop on 1/3 or 2/3.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1171692 13f79535-47bb-0310-9956-ffa450edef68

14 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=51794
fhanik [Wed, 14 Sep 2011 14:39:05 +0000 (14:39 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=51794
Fix race condition in selector potentially causing a delay in select operations

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1170647 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdditional fix for r1170479.
kfujino [Wed, 14 Sep 2011 09:05:40 +0000 (09:05 +0000)]
Additional fix for r1170479.
Make sure calling disconnect() when only setDiscarded(true) is called and the real connection is not closed.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1170485 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix BZ51786.
kfujino [Wed, 14 Sep 2011 08:53:58 +0000 (08:53 +0000)]
Fix BZ51786.
Discarded connection is not active in a pool any longer.
It removes from the active connection list.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1170479 13f79535-47bb-0310-9956-ffa450edef68

14 years agotypo in decorator
fhanik [Mon, 12 Sep 2011 15:25:13 +0000 (15:25 +0000)]
typo in decorator
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1169796 13f79535-47bb-0310-9956-ffa450edef68

14 years agoThe cache only gets populated if the context is
rjung [Sun, 11 Sep 2011 13:14:23 +0000 (13:14 +0000)]
The cache only gets populated if the context is
not null.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1169447 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFollowup to r1164567, because not all occurences have been replaced.
kkolinko [Fri, 9 Sep 2011 23:25:03 +0000 (23:25 +0000)]
Followup to r1164567, because not all occurences have been replaced.

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51758
Align the digester logger names with the class name else users will never be able to figure out how to stop it logging

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1167394 13f79535-47bb-0310-9956-ffa450edef68

14 years agoReviewing r1166576...
kkolinko [Fri, 9 Sep 2011 21:30:28 +0000 (21:30 +0000)]
Reviewing r1166576...
Improve performance of Http11Processor.disableKeepAlive(): call getMaxThreads() first and do not call getCurrentThreadsBusy() twice,
because ThreadPoolExecutor.getActiveCount() in JRE is implemented as a loop that counts threads and that should be expensive.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1167368 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix Eclipse warnings in unit tests
markt [Thu, 8 Sep 2011 15:39:11 +0000 (15:39 +0000)]
Fix Eclipse warnings in unit tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166757 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix possible NPE if instances aren't created through the DefaultInstanceManager but...
markt [Thu, 8 Sep 2011 15:37:06 +0000 (15:37 +0000)]
Fix possible NPE if instances aren't created through the DefaultInstanceManager but are destroyed through it.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166752 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix remaining Eclipse warnings in jdbc-pool unit tests
markt [Thu, 8 Sep 2011 15:14:43 +0000 (15:14 +0000)]
Fix remaining Eclipse warnings in jdbc-pool unit tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166735 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix Eclipse warnings
markt [Thu, 8 Sep 2011 14:54:52 +0000 (14:54 +0000)]
Fix Eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166721 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unnecessary casts
markt [Thu, 8 Sep 2011 14:37:44 +0000 (14:37 +0000)]
Remove unnecessary casts

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166717 13f79535-47bb-0310-9956-ffa450edef68

14 years agoTest inrange rather than ignoring the value
markt [Thu, 8 Sep 2011 14:32:51 +0000 (14:32 +0000)]
Test inrange rather than ignoring the value

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166713 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix Eclipse warnings
markt [Thu, 8 Sep 2011 14:32:08 +0000 (14:32 +0000)]
Fix Eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166712 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix Eclipse warnings
markt [Thu, 8 Sep 2011 14:28:22 +0000 (14:28 +0000)]
Fix Eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166709 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused code
markt [Thu, 8 Sep 2011 13:58:53 +0000 (13:58 +0000)]
Remove unused code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166693 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused import
markt [Thu, 8 Sep 2011 13:54:27 +0000 (13:54 +0000)]
Remove unused import

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166691 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove deprecated code
markt [Thu, 8 Sep 2011 13:53:02 +0000 (13:53 +0000)]
Remove deprecated code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166690 13f79535-47bb-0310-9956-ffa450edef68

14 years agoTomcat 6 introduced a custom attribute for SSL session ID.
markt [Thu, 8 Sep 2011 13:43:02 +0000 (13:43 +0000)]
Tomcat 6 introduced a custom attribute for SSL session ID.
Servlet 3 introduced a standard attribute for this.
Support both, deprecating the custom attribute.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166686 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd caching of postConstruct and preDestroy annotations
markt [Thu, 8 Sep 2011 10:57:19 +0000 (10:57 +0000)]
Add caching of postConstruct and preDestroy annotations

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166620 13f79535-47bb-0310-9956-ffa450edef68