You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2006/11/13 21:09:11 UTC
svn commit: r474481 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW
contributors.xml src/main/org/apache/tools/ant/taskdefs/Jar.java
Author: peterreilly
Date: Mon Nov 13 12:09:11 2006
New Revision: 474481
URL: http://svn.apache.org/viewvc?view=rev&rev=474481
Log:
Bugzilla 40847: possible NPE in Jar.java
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
Modified: ant/core/trunk/CONTRIBUTORS
URL: http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?view=diff&rev=474481&r1=474480&r2=474481
==============================================================================
Binary files - no diff available.
Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=474481&r1=474480&r2=474481
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Mon Nov 13 12:09:11 2006
@@ -17,6 +17,9 @@
take comparison with another CompressedResouce into account.
Bugzilla 40949.
+* possible NPE in Jar.java.
+ Bugzilla 40847
+
Other changes:
--------------
Modified: ant/core/trunk/contributors.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?view=diff&rev=474481&r1=474480&r2=474481
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Mon Nov 13 12:09:11 2006
@@ -35,6 +35,10 @@
<last>Everitt</last>
</name>
<name>
+ <first>Andrey</first>
+ <last>Urazov</last>
+ </name>
+ <name>
<first>Anil</first>
<middle>K.</middle>
<last>Vijendran</last>
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java?view=diff&rev=474481&r1=474480&r2=474481
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java Mon Nov 13 12:09:11 2006
@@ -526,7 +526,7 @@
Manifest.Attribute classpath =
mf.getMainSection().getAttribute(Manifest.ATTRIBUTE_CLASSPATH);
String[] cpEntries = null;
- if (classpath != null) {
+ if (classpath != null && classpath.getValue() != null) {
StringTokenizer tok = new StringTokenizer(classpath.getValue(),
" ");
cpEntries = new String[tok.countTokens()];
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org