Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 98664 invoked from network); 20 Apr 2008 22:40:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Apr 2008 22:40:10 -0000 Received: (qmail 56377 invoked by uid 500); 20 Apr 2008 22:40:04 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 56323 invoked by uid 500); 20 Apr 2008 22:40:04 -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 56312 invoked by uid 500); 20 Apr 2008 22:40:04 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 56309 invoked by uid 99); 20 Apr 2008 22:40:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Apr 2008 15:40:04 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Apr 2008 22:39:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 54F3D1A9832; Sun, 20 Apr 2008 15:39:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r649993 - /tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Date: Sun, 20 Apr 2008 22:39:40 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080420223940.54F3D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Apr 20 15:39:35 2008 New Revision: 649993 URL: http://svn.apache.org/viewvc?rev=649993&view=rev Log: Fix bug 31257. Quote endorsed dirs if they contain a space. Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=649993&r1=649992&r2=649993&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Sun Apr 20 15:39:35 2008 @@ -175,8 +175,10 @@ if(endorsed != null) { Javac.ImplementationSpecificArgument endorsedArg = javac.createCompilerArg(); - endorsedArg.setLine("-J-Djava.endorsed.dirs="+endorsed); - info.append(" endorsed dir=" + endorsed + "\n"); + endorsedArg.setLine("-J-Djava.endorsed.dirs=" + + quotePathList(endorsed)); + info.append(" endorsed dir=" + quotePathList(endorsed) + + "\n"); } else { info.append(" no endorsed dirs specified\n"); } @@ -275,7 +277,26 @@ } } - + private String quotePathList(String list) { + StringBuffer result = new StringBuffer(list.length() + 10); + StringTokenizer st = new StringTokenizer(list, File.pathSeparator); + while (st.hasMoreTokens()) { + String token = st.nextToken(); + if (token.indexOf(' ') == -1) { + result.append(token); + } else { + result.append('\"'); + result.append(token); + result.append('\"'); + } + if (st.hasMoreTokens()) { + result.append(File.pathSeparatorChar); + } + } + return result.toString(); + } + + protected static class SystemLogHandler extends PrintStream { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org