Author: markt
Date: Tue Jun 7 23:56:14 2011
New Revision: 1133204
URL: http://svn.apache.org/viewvc?rev=1133204&view=rev
Log:
Simplify as per kkolinko's review
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1133204&r1=1133203&r2=1133204&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jun 7
23:56:14 2011
@@ -1222,13 +1222,7 @@ public class ContextConfig
InputSource contextWebXml = getContextWebXmlSource();
parseWebXml(contextWebXml, webXml, false);
- // Assuming 0 is safe for what is required in this case
- double webXmlVersion = 0;
- if (webXml.getVersion() != null) {
- webXmlVersion = Double.parseDouble(webXml.getVersion());
- }
-
- if (webXmlVersion >= 3) {
+ if (webXml.getMajorVersion() >= 3) {
// Ordering is important here
// Step 1. Identify all the JARs packaged with the application
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
