From 442fda1ee078cc8a94acaee3a675fa3148848ade Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 7 Jun 2011 23:56:14 +0000 Subject: [PATCH] Simplify as per kkolinko's review git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1133204 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/ContextConfig.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index dad56e387..140329f4a 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -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 -- 2.11.0