tomcat7.0
14 years agoAdd option test.accesslog to activate AccessLog
rjung [Sun, 10 Jul 2011 10:10:33 +0000 (10:10 +0000)]
Add option test.accesslog to activate AccessLog
for unit tests.

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

14 years agoFix regression producing invalid MBean names when using IPV6
rjung [Sun, 10 Jul 2011 06:53:36 +0000 (06:53 +0000)]
Fix regression producing invalid MBean names when using IPV6
addresses for connectors.

- revert r1135088

- remove the surrounding quotes only when
  passing the name to the endpoint, so they
  don't end up in the middle of thread names.
  The thread names are used as MBean attribute
  values, but not in MBean names.

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

14 years agoUpdate to Eclipse JDT Compiler 3.7
markt [Sat, 9 Jul 2011 16:56:49 +0000 (16:56 +0000)]
Update to Eclipse JDT Compiler 3.7

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

14 years agoUpdate to Commons Daemon 1.0.6
markt [Sat, 9 Jul 2011 16:38:39 +0000 (16:38 +0000)]
Update to Commons Daemon 1.0.6

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

14 years agoRemove some more unnecessary code
markt [Sat, 9 Jul 2011 16:05:42 +0000 (16:05 +0000)]
Remove some more unnecessary code

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

14 years agoAdd regression fix to changelog
markt [Sat, 9 Jul 2011 15:21:46 +0000 (15:21 +0000)]
Add regression fix to changelog

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

14 years agoFix Comet with HTTP/APR connector
markt [Sat, 9 Jul 2011 00:28:44 +0000 (00:28 +0000)]
Fix Comet with HTTP/APR connector
r1144391 switched the key for the processor map for this connector from the socket to the socket wrapper. That prevented Comet from being able to retrieve the processor from the map when processing a comet event.
This commit changes all the connectors to map the socket (or rather whatever the SocketWrapper wraps) to the processor rather than the SocketWrapper.

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

14 years agoPull up Handler.process
markt [Fri, 8 Jul 2011 18:01:30 +0000 (18:01 +0000)]
Pull up Handler.process

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

14 years agoAlign AJP and HTTP prior to pulling up Handler.process
markt [Fri, 8 Jul 2011 17:28:25 +0000 (17:28 +0000)]
Align AJP and HTTP prior to pulling up Handler.process

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

14 years agoPull up Handler.process for the Http11 connectors.
markt [Fri, 8 Jul 2011 17:19:38 +0000 (17:19 +0000)]
Pull up Handler.process for the Http11 connectors.
Note that this is an intermediate step. The aim is to pull this up to AbstractProtocol

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

14 years agoPull up Handler.process for the Ajp Connectors.
markt [Fri, 8 Jul 2011 17:19:19 +0000 (17:19 +0000)]
Pull up Handler.process for the Ajp Connectors.
Note that this is an intermediate step. The aim is to pull this up to AbstractProtocol

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

14 years agoYet more protocol alignment (with an eye to aligning with AJP)
markt [Fri, 8 Jul 2011 16:19:28 +0000 (16:19 +0000)]
Yet more protocol alignment (with an eye to aligning with AJP)

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

14 years agoChange eol-style and add link to jdbc-pool on the documentation home page
fhanik [Fri, 8 Jul 2011 15:34:18 +0000 (15:34 +0000)]
Change eol-style and add link to jdbc-pool on the documentation home page

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

14 years agoMore protocol alignment (with an eye to aligning with AJP)
markt [Fri, 8 Jul 2011 15:10:01 +0000 (15:10 +0000)]
More protocol alignment (with an eye to aligning with AJP)

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

14 years agoProtocol will call recycle
markt [Fri, 8 Jul 2011 14:59:43 +0000 (14:59 +0000)]
Protocol will call recycle

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

14 years agoBring the Http11 protocol implementations closer together.
markt [Fri, 8 Jul 2011 14:04:08 +0000 (14:04 +0000)]
Bring the Http11 protocol implementations closer together.

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

14 years agoCompletely align process methods
markt [Fri, 8 Jul 2011 11:56:33 +0000 (11:56 +0000)]
Completely align process methods

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

14 years agoAlign the process methods some more.
markt [Fri, 8 Jul 2011 11:49:50 +0000 (11:49 +0000)]
Align the process methods some more.

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

14 years agoAlign the process methods some more.
markt [Fri, 8 Jul 2011 11:40:36 +0000 (11:40 +0000)]
Align the process methods some more.

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

14 years agoRemove unnecessary call. Socket can't be in connections at this point.
markt [Fri, 8 Jul 2011 11:21:37 +0000 (11:21 +0000)]
Remove unnecessary call. Socket can't be in connections at this point.
Leave currently unused socket parameter in method - plan to use it in later re-factoring

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

14 years agoImprove comments
markt [Fri, 8 Jul 2011 11:19:32 +0000 (11:19 +0000)]
Improve comments

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

14 years agoFix regression in connector re-factoring that was too aggressive cleaning up AJP...
markt [Fri, 8 Jul 2011 10:45:19 +0000 (10:45 +0000)]
Fix regression in connector re-factoring that was too aggressive cleaning up AJP/BIO between requests triggering 400 entries in the access log

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

14 years agoFix indentation
markt [Fri, 8 Jul 2011 09:50:02 +0000 (09:50 +0000)]
Fix indentation

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

14 years agoPull up reset for remoteHost etc. to a common location
markt [Thu, 7 Jul 2011 22:14:07 +0000 (22:14 +0000)]
Pull up reset for remoteHost etc. to a common location

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

14 years agoRemove pointless code (see finally block just above)
markt [Thu, 7 Jul 2011 21:58:51 +0000 (21:58 +0000)]
Remove pointless code (see finally block just above)

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

14 years agoPull up asyncDispatch()
markt [Thu, 7 Jul 2011 21:57:13 +0000 (21:57 +0000)]
Pull up asyncDispatch()

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

14 years agoInclude jdbc-pool into tomcat release.
fhanik [Thu, 7 Jul 2011 21:40:05 +0000 (21:40 +0000)]
Include jdbc-pool into tomcat release.

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

14 years agoNo functional change - make it the same as BIO & APR
markt [Thu, 7 Jul 2011 21:23:42 +0000 (21:23 +0000)]
No functional change - make it the same as BIO & APR

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

14 years agoMissed a reference to comet which will always be false in asyncDispatch
markt [Thu, 7 Jul 2011 21:22:43 +0000 (21:22 +0000)]
Missed a reference to comet which will always be false in asyncDispatch

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

14 years agoRemove unnecessary throws
markt [Thu, 7 Jul 2011 21:22:01 +0000 (21:22 +0000)]
Remove unnecessary throws
Move timeout lookups to where the timeouts are reset (in preparation for this being in a separate method)

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

14 years agoCollapse the multiple if statements
markt [Thu, 7 Jul 2011 21:18:11 +0000 (21:18 +0000)]
Collapse the multiple if statements

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

14 years agoPost refactoring, can't be processing a comet request in asyncDispatch
markt [Thu, 7 Jul 2011 21:17:25 +0000 (21:17 +0000)]
Post refactoring, can't be processing a comet request in asyncDispatch

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

14 years agoAdd re-factoring to the changelog
markt [Thu, 7 Jul 2011 21:00:18 +0000 (21:00 +0000)]
Add re-factoring to the changelog

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

14 years agoAlready loaded via SecurityClassLoad
markt [Thu, 7 Jul 2011 20:58:11 +0000 (20:58 +0000)]
Already loaded via SecurityClassLoad

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

14 years agoUse SecurityClassLoad to pre-load HexUtils to prevent a security exception
markt [Thu, 7 Jul 2011 20:53:51 +0000 (20:53 +0000)]
Use SecurityClassLoad to pre-load HexUtils to prevent a security exception

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

14 years agoUpdate ready for next release
markt [Wed, 6 Jul 2011 23:22:06 +0000 (23:22 +0000)]
Update ready for next release

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

14 years agoRemove debug code
markt [Wed, 6 Jul 2011 23:12:15 +0000 (23:12 +0000)]
Remove debug code

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

14 years agoRefactor to avoid NPEs during test
markt [Wed, 6 Jul 2011 16:31:31 +0000 (16:31 +0000)]
Refactor to avoid NPEs during test

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

14 years agoCorrect regression caused by connector re-factoring that meant that sendfile data...
markt [Wed, 6 Jul 2011 15:05:45 +0000 (15:05 +0000)]
Correct regression caused by connector re-factoring that meant that sendfile data was not reset between pipe-lined HTTP requests.

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

14 years agoFix typo
markt [Wed, 6 Jul 2011 12:34:27 +0000 (12:34 +0000)]
Fix typo

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

14 years agoAdd sync to fix test failures on Linux.
markt [Wed, 6 Jul 2011 12:31:50 +0000 (12:31 +0000)]
Add sync to fix test failures on Linux.
Should have minimal impact in normal Tomcat usage since each instance/JVM only opens a single socket.

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

14 years agoRefactor the bind call to reduce the length of the stack traces when the unit tests...
markt [Wed, 6 Jul 2011 10:51:18 +0000 (10:51 +0000)]
Refactor the bind call to reduce the length of the stack traces when the unit tests fail. It probably won't fix the issue but it will make the logs easier to read.

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

14 years agoNot just this test failing. Need a better solution. Revert r1143126.
markt [Tue, 5 Jul 2011 20:33:28 +0000 (20:33 +0000)]
Not just this test failing. Need a better solution. Revert r1143126.

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

14 years agoJavadoc fixes
markt [Tue, 5 Jul 2011 19:53:53 +0000 (19:53 +0000)]
Javadoc fixes

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

14 years agoReview comments
markt [Tue, 5 Jul 2011 17:28:44 +0000 (17:28 +0000)]
Review comments

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51475
markt [Tue, 5 Jul 2011 16:45:38 +0000 (16:45 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51475
Handle messages larger than the buffer size. Expand test cases to cover this.
Based on a patch by Christian Stöber.

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

14 years agoExtract test to a test case
markt [Tue, 5 Jul 2011 16:32:28 +0000 (16:32 +0000)]
Extract test to a test case

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

14 years agoPrevent test failures on Linux
markt [Tue, 5 Jul 2011 16:21:51 +0000 (16:21 +0000)]
Prevent test failures on Linux

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

14 years agoUpdate changelog
markt [Tue, 5 Jul 2011 12:28:50 +0000 (12:28 +0000)]
Update changelog

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

14 years agoRemove unused code
markt [Tue, 5 Jul 2011 12:26:09 +0000 (12:26 +0000)]
Remove unused code

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

14 years agoBased on current usage within Tomcat, message length of 0 should result in null.
markt [Tue, 5 Jul 2011 12:25:38 +0000 (12:25 +0000)]
Based on current usage within Tomcat, message length of 0 should result in null.
Populate the test for this and ensure the test passes.

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

14 years agoRemove main method
markt [Tue, 5 Jul 2011 12:22:03 +0000 (12:22 +0000)]
Remove main method

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

14 years agoRemove ununsed methods.
markt [Tue, 5 Jul 2011 12:21:37 +0000 (12:21 +0000)]
Remove ununsed methods.
Convert from using main() to a unit test
Use valid test data

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

14 years agoMove working JUnit tests to align with package of class being tested.
markt [Tue, 5 Jul 2011 12:06:04 +0000 (12:06 +0000)]
Move working JUnit tests to align with package of class being tested.

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

14 years agoLimit exclusion to 'old' tests so tests added to o.a.catalina.tribes will execute
markt [Tue, 5 Jul 2011 11:36:41 +0000 (11:36 +0000)]
Limit exclusion to 'old' tests so tests added to o.a.catalina.tribes will execute

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

14 years agoRevert r1142953. The analysis was incorrect.
markt [Tue, 5 Jul 2011 10:42:15 +0000 (10:42 +0000)]
Revert r1142953. The analysis was incorrect.

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

14 years agoFix response.encodeURL() for the special case of
rjung [Tue, 5 Jul 2011 10:08:00 +0000 (10:08 +0000)]
Fix response.encodeURL() for the special case of
an absolute URL with no path segment (http://name).

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
markt [Tue, 5 Jul 2011 10:03:06 +0000 (10:03 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
Correctly test modifiers when resolving bean methods with the BeanELResolver.
Patch provided by Friedhelm Kuehn.

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

14 years agoFurther improvements to the Windows installer
kkolinko [Tue, 5 Jul 2011 08:31:52 +0000 (08:31 +0000)]
Further improvements to the Windows installer
1. Install into "**/Tomcat7.0_servicename" when service name differs from default,
but install into "**/Tomcat7.0" if the name is the default one.
This is to be in line with 7.0.16 and earlier versions, but
differs from 7.0.17 which used "**/Tomcat7.0/servicename".
2. Changed name of registry key for running of Tomcat Monitor
3. Do not forget to delete Tomcat Monitor running entry from HKCU in 32-bit part of registry

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473
kkolinko [Tue, 5 Jul 2011 07:10:31 +0000 (07:10 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473
Fix concatenation of values in SecurityConfig.setSecurityProperty()
when the value provided by JRE is null.

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

14 years agoValidate Windows service name
markt [Mon, 4 Jul 2011 20:05:26 +0000 (20:05 +0000)]
Validate Windows service name

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

14 years agoCorrect regression caused by connector re-factoring that made AJP
markt [Mon, 4 Jul 2011 17:46:15 +0000 (17:46 +0000)]
Correct regression caused by connector re-factoring that made AJP
APR/native connector very unstable on Windows platforms.

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 14:08:42 +0000 (14:08 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 14:05:43 +0000 (14:05 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 14:02:36 +0000 (14:02 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:59:53 +0000 (13:59 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:54:52 +0000 (13:54 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:51:26 +0000 (13:51 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:41:43 +0000 (13:41 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:37:22 +0000 (13:37 +0000)]
Add @Override annotation

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

14 years agoFix "potential null pointer access warning".
kkolinko [Mon, 4 Jul 2011 13:34:48 +0000 (13:34 +0000)]
Fix "potential null pointer access warning".

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

14 years agoFix "potential null pointer access warning".
kkolinko [Mon, 4 Jul 2011 13:29:44 +0000 (13:29 +0000)]
Fix "potential null pointer access warning".
As a bonus, it avoids allocating char[] buffer for an empty string.
Add $FALL-THROUGH$ comment where we fall through to the next label in switch().

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

14 years agoFix a small number of warnings
markt [Mon, 4 Jul 2011 13:28:11 +0000 (13:28 +0000)]
Fix a small number of warnings

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:21:29 +0000 (13:21 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:12:31 +0000 (13:12 +0000)]
Add @Override annotation

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

14 years agoRemove publicId field from SchemaResolver class,
kkolinko [Mon, 4 Jul 2011 13:10:38 +0000 (13:10 +0000)]
Remove publicId field from SchemaResolver class,
because is never read and is not cleared when digester is reused.
If anyone needs this, this value is available by calling SchemaResolver.digester.getPublicId().

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51467
markt [Mon, 4 Jul 2011 12:50:24 +0000 (12:50 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51467
start() not run()
Patch provided by Felix Schumacher

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51466
markt [Mon, 4 Jul 2011 12:43:19 +0000 (12:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51466
Fix typos
Patch by Felix Schumacher

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

14 years agoFix possible NPE
markt [Sun, 3 Jul 2011 13:15:58 +0000 (13:15 +0000)]
Fix possible NPE

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

14 years agoStart the 7.0.18 changelog
markt [Sat, 2 Jul 2011 21:59:37 +0000 (21:59 +0000)]
Start the 7.0.18 changelog

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

14 years agoFix Eclipse warnings in the o.a.c.startup package
markt [Sat, 2 Jul 2011 21:57:12 +0000 (21:57 +0000)]
Fix Eclipse warnings in the o.a.c.startup package

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

14 years agoRemove dead code
markt [Sat, 2 Jul 2011 21:52:35 +0000 (21:52 +0000)]
Remove dead code

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

14 years agoFix generics warnings
markt [Sat, 2 Jul 2011 21:51:14 +0000 (21:51 +0000)]
Fix generics warnings

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

14 years agoFix Javadoc warnings spotted in 7.0.17 build
markt [Sat, 2 Jul 2011 21:44:32 +0000 (21:44 +0000)]
Fix Javadoc warnings spotted in 7.0.17 build

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

14 years agoUpdate ready for for next release
markt [Sat, 2 Jul 2011 21:37:05 +0000 (21:37 +0000)]
Update ready for for next release

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

14 years agoOnly add instance if it has just been created.
markt [Sat, 2 Jul 2011 12:01:30 +0000 (12:01 +0000)]
Only add instance if it has just been created.

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

14 years agoCorrect deadlock introduced in r1142112
markt [Sat, 2 Jul 2011 11:29:46 +0000 (11:29 +0000)]
Correct deadlock introduced in r1142112

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

14 years agoWhen using Servlets that implement the SingleThreadModel interface, add the single...
markt [Fri, 1 Jul 2011 22:47:46 +0000 (22:47 +0000)]
When using Servlets that implement the SingleThreadModel interface, add the single instance created to the pool when it is determined that a pool of servlets is required rather than throwing it away.

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

14 years agoPrevent test failures when two objects get generated with the same hashCode
markt [Fri, 1 Jul 2011 22:44:04 +0000 (22:44 +0000)]
Prevent test failures when two objects get generated with the same hashCode

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

14 years agoRead/write by multiple threads outside sync - needs to be volatile
markt [Fri, 1 Jul 2011 21:50:14 +0000 (21:50 +0000)]
Read/write by multiple threads outside sync - needs to be volatile

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

14 years agoIn Tomcat.initBaseDir():
kkolinko [Fri, 1 Jul 2011 20:20:33 +0000 (20:20 +0000)]
In Tomcat.initBaseDir():
set a value for catalina.home only if it has not been set previously.

Without this fix, I guess, you won't be able to run embedded Tomcat with
separate catalina.base and catalina.home.

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

14 years agoFollowup to r1140693
kkolinko [Fri, 1 Jul 2011 19:46:00 +0000 (19:46 +0000)]
Followup to r1140693
Declare a separate public method for the new use case of makeJavaIdentifier(),
instead of passing the "false" flag as an argument.

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

14 years agoAdd support for configuring the shutdown port
markt [Fri, 1 Jul 2011 18:06:08 +0000 (18:06 +0000)]
Add support for configuring the shutdown port

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

14 years agoBuild server.xml for the installer by search and replace rather than combining fragme...
markt [Fri, 1 Jul 2011 17:35:09 +0000 (17:35 +0000)]
Build server.xml for the installer by search and replace rather than combining fragments. No ore work to keep the original and the fragments in sync and esy to expand to add additional search/replace as well as insertions etc.

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

14 years agoUse specified AJP port rather than always using default
markt [Fri, 1 Jul 2011 16:25:28 +0000 (16:25 +0000)]
Use specified AJP port rather than always using default

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

14 years agoConsistent reporting for the connectors
markt [Fri, 1 Jul 2011 14:52:24 +0000 (14:52 +0000)]
Consistent reporting for the connectors

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

14 years agoFix possible NPE when serving STM servlets
markt [Fri, 1 Jul 2011 14:15:48 +0000 (14:15 +0000)]
Fix possible NPE when serving STM servlets

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

14 years agoIf things go wrong, don't wait forever for the latch.
markt [Fri, 1 Jul 2011 14:05:00 +0000 (14:05 +0000)]
If things go wrong, don't wait forever for the latch.

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

14 years agoFix faulty test
markt [Fri, 1 Jul 2011 13:41:25 +0000 (13:41 +0000)]
Fix faulty test

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

14 years agoSeen on Windows too (less frequently)
markt [Fri, 1 Jul 2011 10:03:04 +0000 (10:03 +0000)]
Seen on Windows too (less frequently)

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