Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33A53C19D for ; Fri, 4 May 2012 09:44:02 +0000 (UTC) Received: (qmail 66360 invoked by uid 500); 4 May 2012 09:44:01 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 66262 invoked by uid 500); 4 May 2012 09:44:00 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 66238 invoked by uid 99); 4 May 2012 09:43:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 09:43:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 09:43:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C3C4F2388847 for ; Fri, 4 May 2012 09:43:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333827 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Date: Fri, 04 May 2012 09:43:38 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120504094338.C3C4F2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri May 4 09:43:38 2012 New Revision: 1333827 URL: http://svn.apache.org/viewvc?rev=1333827&view=rev Log: Use a proper URL else attempts to external entities will fail. Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1333827&r1=1333826&r2=1333827&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Fri May 4 09:43:38 2012 @@ -451,7 +451,7 @@ public class Catalina { FileInputStream fis = null; try { InputSource is = - new InputSource("file://" + file.getAbsolutePath()); + new InputSource(file.toURI().toURL().toString()); fis = new FileInputStream(file); is.setByteStream(fis); digester.push(this); @@ -539,7 +539,7 @@ public class Catalina { try { file = configFile(); inputStream = new FileInputStream(file); - inputSource = new InputSource("file://" + file.getAbsolutePath()); + inputSource = new InputSource(file.toURI().toURL().toString()); } catch (Exception e) { if (log.isDebugEnabled()) { log.debug(sm.getString("catalina.configFail", file), e); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org