Author: violetagg
Date: Wed Sep 3 05:36:04 2014
New Revision: 1622163
URL: http://svn.apache.org/r1622163
Log:
Fixed the multipart elements merge operation performed during web application
deployment. Identified by Coverity Scan.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1622163&r1=1622162&r2=1622163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Wed Sep
3 05:36:04 2014
@@ -2082,7 +2082,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/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1622163&r1=1622162&r2=1622163&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 3 05:36:04 2014
@@ -84,6 +84,10 @@
with new Context options to select and configure it. This parser is
currently considered experiemental and is not used by default. (markt)
</add>
+ <fix>
+ Fixed the multipart elements merge operation performed during web
+ application deployment. Identified by Coverity Scan. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
