Author: remy.maucherat(a)jboss.com Date: 2009-02-25 09:37:49 -0500 (Wed, 25 Feb 2009) New Revision: 941 Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java Log: - Port some cleanup. Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-02-25 13:04:57 UTC (rev 940) +++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-02-25 14:37:49 UTC (rev 941) @@ -381,7 +381,7 @@ synchronized (webDigester) { try { if (altDDName != null) { - url = new File(altDDName).toURL(); + url = new File(altDDName).toURI().toURL(); } else { url = servletContext.getResource( Constants.ApplicationWebXml); @@ -958,8 +958,7 @@ } - protected void antiLocking() - throws IOException { + protected void antiLocking() { if ((context instanceof StandardContext) && ((StandardContext) context).getAntiResourceLocking()) { @@ -1057,13 +1056,7 @@ * Process a "before start" event for this Context. */ protected synchronized void beforeStart() { - - try { - antiLocking(); - } catch (IOException e) { - log.error(sm.getString("contextConfig.antiLocking"), e); - } - + antiLocking(); }