Author: violetagg
Date: Wed Sep 3 05:42:53 2014
New Revision: 1622164
URL: http://svn.apache.org/r1622164
Log:
Merged revision 1622163 from tomcat/trunk:
Fixed the multipart elements merge operation performed during web application
deployment. Identified by Coverity Scan.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1622163
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1622164&r1=1622163&r2=1622164&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Wed Sep 3
05:42:53 2014
@@ -2231,7 +2231,7 @@ public class WebXml {
if (dest.getMaxFileSize() == null) {
dest.setMaxFileSize(src.getMaxFileSize());
- } else if (src.getLocation() != null) {
+ } else if (src.getMaxFileSize() != null) {
if (failOnConflict &&
!src.getMaxFileSize().equals(dest.getMaxFileSize())) {
return false;
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=1622164&r1=1622163&r2=1622164&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 3 05:42:53 2014
@@ -102,6 +102,10 @@
<bug>56882</bug>: Add testcase for processing of forwards and includes
when Context have been reloaded. (kkolinko)
</scode>
+ <fix>
+ Fixed the multipart elements merge operation performed during web
+ application deployment. Identified by Coverity Scan. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
