Author: violetagg
Date: Wed Jun 25 13:54:01 2014
New Revision: 1605405
URL: http://svn.apache.org/r1605405
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56665
Merged revision 1605402 from tomcat/trunk:
Correct the generation of the effective web.xml when elements contain an empty
string as value.
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:r1605402
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=1605405&r1=1605404&r2=1605405&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 Jun 25
13:54:01 2014
@@ -1247,15 +1247,24 @@ public class WebXml {
private static void appendElement(StringBuilder sb, String indent,
String elementName, String value) {
- if (value == null || value.length() == 0) return;
- sb.append(indent);
- sb.append('<');
- sb.append(elementName);
- sb.append('>');
- sb.append(escapeXml(value));
- sb.append("</");
- sb.append(elementName);
- sb.append(">\n");
+ if (value == null) {
+ return;
+ }
+ if (value.length() == 0) {
+ sb.append(indent);
+ sb.append('<');
+ sb.append(elementName);
+ sb.append("/>\n");
+ } else {
+ sb.append(indent);
+ sb.append('<');
+ sb.append(elementName);
+ sb.append('>');
+ sb.append(escapeXml(value));
+ sb.append("</");
+ sb.append(elementName);
+ sb.append(">\n");
+ }
}
private static void appendElement(StringBuilder sb, String indent,
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=1605405&r1=1605404&r2=1605405&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 25 13:54:01 2014
@@ -121,6 +121,10 @@
Assert that mapping result object is empty before performing mapping
work in <code>Mapper</code>. (kkolinko)
</fix>
+ <fix>
+ <bug>56665</bug>: Correct the generation of the effective web.xml when
+ elements contain an empty string as value. (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
