From b8bf84b852a164060b887fc101bfdd1e357d1ac6 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 22 Sep 2003 15:05:21 +0000 Subject: [PATCH] Merge fix for 23320 from 1.6 branch git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275281 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ build.xml | 4 ++-- docs/manual/cover.html | 6 +++--- .../tools/ant/taskdefs/optional/splash/SplashTask.java | 8 +++++++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index e20e2a8a1..89df3984f 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -245,6 +245,9 @@ Fixed bugs: * replaced the CLASSPATH instead of adding to it. Bugzilla Report 14971. +* could fail on JVMs that use null to indicate the system classloader. + Bugzilla Report 23320. + Other changes: -------------- * All tasks can be used outside of s. Note that some tasks diff --git a/build.xml b/build.xml index e4eca82f5..c4fd250cb 100644 --- a/build.xml +++ b/build.xml @@ -25,8 +25,8 @@ --> - - + + diff --git a/docs/manual/cover.html b/docs/manual/cover.html index a6caeea49..72b3e93f6 100644 --- a/docs/manual/cover.html +++ b/docs/manual/cover.html @@ -2,14 +2,14 @@ -Apache Ant 1.6 User Manual +Apache Ant 1.7 User Manual

-

Apache Ant 1.6 Manual

-

This is the manual for version 1.6alpha of +

Apache Ant 1.7 Manual

+

This is the manual for version 1.7alpha of Apache Ant. If your version of Ant (as verified with ant -version) is older or newer than this diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java index 21a65e860..d77906b6a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java @@ -198,7 +198,13 @@ public class SplashTask extends Task { } if (in == null) { - in = SplashTask.class.getClassLoader().getResourceAsStream("images/ant_logo_large.gif"); + ClassLoader cl = SplashTask.class.getClassLoader(); + if (cl != null) { + in = cl.getResourceAsStream("images/ant_logo_large.gif"); + } else { + in = ClassLoader + .getSystemResourceAsStream("images/ant_logo_large.gif"); + } } if (in != null) {