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
22 years ago · b8bf84b852
--- a/+ 3
+++ b/+ 3
@@ -245,6 +245,9 @@ Fixed bugs:
 * <junit includeantruntime="true" fork="true"> replaced the CLASSPATH instead
  of adding to it.  Bugzilla Report 14971.

 * <splash> could fail on JVMs that use null to indicate the system classloader.
  Bugzilla Report 23320.

 Other changes:
 --------------
 * All tasks can be used outside of <target>s.  Note that some tasks
--- a/build.xml
+++ b/build.xml
@@ -25,8 +25,8 @@
  -->
  <property name="Name" value="Apache Ant"/>
  <property name="name" value="ant"/>
  <property name="version" value="1.6alpha"/>
  <property name="manifest-version" value="1.6"/>
  <property name="version" value="1.7alpha"/>
  <property name="manifest-version" value="1.7"/>
  <property name="bootstrap.jar" value="ant-bootstrap.jar"/>

  <property name="ant.package" value="org/apache/tools/ant"/>
--- a/docs/manual/cover.html
+++ b/docs/manual/cover.html
@@ -2,14 +2,14 @@

 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <title>Apache Ant 1.6 User Manual</title>
 <title>Apache Ant 1.7 User Manual</title>
 </head>

 <body bgcolor="#FFFFFF">
 <div align="center"> 
  <h1><img src="../images/ant_logo_large.gif" width="190" height="120"></h1>
  <h1>Apache Ant 1.6 Manual</h1>
  <p align="left">This is the manual for version 1.6alpha of 
  <h1>Apache Ant 1.7 Manual</h1>
  <p align="left">This is the manual for version 1.7alpha of 
  <a href="http://ant.apache.org/index.html">Apache Ant</a>. 
    If your version 
    of Ant (as verified with <tt>ant -version</tt>) is older or newer than this 
--- 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) {