Author: markt
Date: Sun Mar 7 11:41:27 2010
New Revision: 919974
URL: http://svn.apache.org/viewvc?rev=919974&view=rev
Log:
Make getVersion(), getMagorVersion() and getMinorVersion() return consistent
values
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=919974&r1=919973&r2=919974&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Sun Mar 7
11:41:27 2010
@@ -112,8 +112,13 @@
// Common elements and attributes
// Required attribute of web-app element
- private String version = null;
- public String getVersion() { return version; }
+ public String getVersion() {
+ StringBuilder sb = new StringBuilder(3);
+ sb.append(majorVersion);
+ sb.append('.');
+ sb.append(minorVersion);
+ return sb.toString();
+ }
/**
* Set the version for this web.xml file
* @param version Values of <code>null</code> will be ignored
@@ -121,7 +126,6 @@
public void setVersion(String version) {
if (version == null) return;
- this.version = version;
// Update major and minor version
// Expected format is n.n - allow for any number of digits just in case
String major = null;
@@ -571,12 +575,7 @@
sb.append(" xsi:schemaLocation=");
sb.append("\"http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\"\n";);
sb.append(" version=\"");
- if (version != null) {
- sb.append(version);
- } else {
- // Should be non-null but in case it isn't assume 3.0
- sb.append("3.0");
- }
+ sb.append(getVersion());
sb.append("\"\n");
sb.append(" metadata-complete=\"true\">\n\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
