From: markt Date: Mon, 20 Jun 2011 20:20:27 +0000 (+0000) Subject: Fix odd looking code X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=49e56bd61d421e5000d457238cb9ee90d2e24f95;p=tomcat7.0 Fix odd looking code git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137764 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index 4e75ab83d..4e50dd02a 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -1307,7 +1307,7 @@ public class ContextConfig webXml.merge(defaults); // Step 8. Convert explicitly mentioned jsps to servlets - if (!false) { + if (ok) { convertJsps(webXml); }