Fix logic error. No functional impact but the code would have been a little slower.
Based on a patch by martinschaef.
This closes #13

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1618567 13f79535-47bb-0310-9956-ffa450edef68
Delete empty directories. They are not tracked by Git.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620452 13f79535-47bb-0310-9956-ffa450edef68
For https://issues.apache.org/bugzilla/show_bug.cgi?id=56882
Add testcase for processing of forwards and includes when Context have been reloaded. The bug is absent in Tomcat 7.

This is a backport of r1620326.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620577 13f79535-47bb-0310-9956-ffa450edef68
Back-ported r1620743:
- Fixed minor resource-leak [Coverity issue #45132]

_M   .
M    java/org/apache/catalina/startup/CatalinaProperties.java


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620747 13f79535-47bb-0310-9956-ffa450edef68
Update expected value after changes in r1617447

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620827 13f79535-47bb-0310-9956-ffa450edef68
Back-port 1620915
Add super.finalize to finalize() methods that were missing them.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620916 13f79535-47bb-0310-9956-ffa450edef68
Back-ported r1620917
Moved resource-freeing code from finalize() to breakdown()
Have finalize() call breakdown() instead of vice-versa.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620918 13f79535-47bb-0310-9956-ffa450edef68
Back-ported r1620923
Added missing hashCode method.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620924 13f79535-47bb-0310-9956-ffa450edef68
Reverted r1620924 after review.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1620959 13f79535-47bb-0310-9956-ffa450edef68
Mention the attribute name that configures the swallow limit added in 7.0.55.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1621366 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1621975 from tomcat/trunk:
According to JavaDoc javax.servlet.jsp.PageContext.include(String) and javax.servlet.jsp.PageContext.include(String, boolean) must throw IOException if I/O error occur during the operation.
When JSPServlet init parameter "development" is "false" then IOException is re-thrown, but when the parameter is "true", JasperException is thrown instead of IOException.
This change guarantees that IOException is always re-thrown.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1621998 13f79535-47bb-0310-9956-ffa450edef68
svn:eol-style = native

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622062 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1622163 from tomcat/trunk:
Fixed the multipart elements merge operation performed during web application deployment. Identified by Coverity Scan.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622164 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1621731 from tomcat/trunk:
Correct the return value for StandardContext.getResourceOnlyServlets()
so that multiple names are separated by commas. Identified by Coverity
Scan and fixed based on a patch by Felix Schumacher.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622166 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1621929 from tomcat/trunk:
Fix unit test for BZ 56903

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622173 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1622187 from tomcat/trunk:
Correct the information written by ExtendedAccessLogValve when a format token x-O(XXX) is used so that multiple values for a header XXX are separated by commas. Identified by Coverity Scan.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622189 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56857
Merged revision 1618169 from tomcat/trunk:
Fix thread safety issue when calling ServletContext methods while running under a security manager.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622215 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56907
Ensure that client IO threads are stopped if a secure WebSocket client connection fails.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622236 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1622228 from tomcat/trunk:
Fix a potential resource leak when reading MANIFEST.MF file for extension dependencies reported by Coverity Scan.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1622240 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56905
Make destruction on web application stop of thread group used for WebSocket connections more robust.
Patch by kkolinko with minor tweaks

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