bodewig 01/12/14 03:49:15
Modified: src/main/org/apache/tools/ant/taskdefs Manifest.java
Log:
fix NPE.
Revision Changes Path
1.15 +5 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
Index: Manifest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Manifest.java 2001/12/12 14:52:35 1.14
+++ Manifest.java 2001/12/14 11:49:15 1.15
@@ -707,7 +707,11 @@
}
Manifest rhsManifest = (Manifest)rhs;
- if (!manifestVersion.equals(rhsManifest.manifestVersion)) {
+ if (manifestVersion == null) {
+ if (rhsManifest.manifestVersion != null) {
+ return false;
+ }
+ } else if (!manifestVersion.equals(rhsManifest.manifestVersion)) {
return false;
}
if (sections.size() != rhsManifest.sections.size()) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
