Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 73796 invoked from network); 20 Jan 2011 08:26:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jan 2011 08:26:00 -0000 Received: (qmail 14243 invoked by uid 500); 20 Jan 2011 08:26:00 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 14166 invoked by uid 500); 20 Jan 2011 08:25:57 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 14159 invoked by uid 99); 20 Jan 2011 08:25:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 08:25:57 +0000 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 08:25:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4D0DB23889E0; Thu, 20 Jan 2011 08:25:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1061156 - /ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java Date: Thu, 20 Jan 2011 08:25:36 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110120082536.4D0DB23889E0@eris.apache.org> Author: bodewig Date: Thu Jan 20 08:25:35 2011 New Revision: 1061156 URL: http://svn.apache.org/viewvc?rev=1061156&view=rev Log: Give build.sysclasspath a chance to influence a forked VM's bootclasspath even if the user didn't supply one herself Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java?rev=1061156&r1=1061155&r2=1061156&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java Thu Jan 20 08:25:35 2011 @@ -678,13 +678,14 @@ public class CommandlineJava implements + "the target VM doesn't support it."); } } else { - if (bootclasspath != null) { - return bootclasspath.concatSystemBootClasspath(isCloneVm() - ? "last" - : "ignore"); - } else if (isCloneVm()) { - return Path.systemBootClasspath; + Path b = bootclasspath; + if (b == null) { + b = new Path(null); } + // even with no user-supplied bootclasspath + // build.sysclasspath could be set to something other than + // "ignore" and thus create one + return b.concatSystemBootClasspath(isCloneVm() ? "last" : "ignore"); } return new Path(null); }