From d2405f4003191f71936d22f956496e8f28035cfa Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 14 Dec 2001 11:49:15 +0000 Subject: [PATCH] fix NPE. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270142 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Manifest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index 4ff51bb01..eea296674 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -707,7 +707,11 @@ public class Manifest extends Task { } 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()) {