bodewig 2003/09/22 08:02:02
Modified: . Tag: ANT_16_BRANCH WHATSNEW build.xml
src/main/org/apache/tools/ant/taskdefs/optional/splash Tag:
ANT_16_BRANCH SplashTask.java
Log:
Make <splash> work on VMs that use null to indicate the system classloader,
PR 23320
Revision Changes Path
No revision
No revision
1.503.2.1 +5 -2 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503
retrieving revision 1.503.2.1
diff -u -r1.503 -r1.503.2.1
--- WHATSNEW 19 Sep 2003 09:18:16 -0000 1.503
+++ WHATSNEW 22 Sep 2003 15:02:01 -0000 1.503.2.1
@@ -1,5 +1,5 @@
-Changes from Ant 1.5.4 to current CVS version
-=============================================
+Changes from Ant 1.5.4 to Ant 1.6
+=================================
Changes that could break older environments:
--------------------------------------------
@@ -244,6 +244,9 @@
* <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:
--------------
1.392.2.1 +1 -1 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392
retrieving revision 1.392.2.1
diff -u -r1.392 -r1.392.2.1
--- build.xml 3 Sep 2003 10:01:29 -0000 1.392
+++ build.xml 22 Sep 2003 15:02:02 -0000 1.392.2.1
@@ -25,7 +25,7 @@
-->
<property name="Name" value="Apache Ant"/>
<property name="name" value="ant"/>
- <property name="version" value="1.6alpha"/>
+ <property name="version" value="1.6beta"/>
<property name="manifest-version" value="1.6"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
No revision
No revision
1.9.2.1 +7 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
Index: SplashTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- SplashTask.java 22 Aug 2003 15:25:44 -0000 1.9
+++ SplashTask.java 22 Sep 2003 15:02:02 -0000 1.9.2.1
@@ -198,7 +198,13 @@
}
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
