ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [5/7] ant git commit: uncover hidden NullPointerException
Date Wed, 21 Dec 2016 10:23:51 GMT
uncover hidden NullPointerException


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/64d1056c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/64d1056c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/64d1056c

Branch: refs/heads/master
Commit: 64d1056c41516ea0a35e8b7c9d9efaab4153027a
Parents: eaf3af0
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Wed Dec 21 11:22:23 2016 +0100
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Wed Dec 21 11:22:23 2016 +0100

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/taskdefs/Jar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/64d1056c/src/main/org/apache/tools/ant/taskdefs/Jar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index a0337e1..330b5dd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -413,7 +413,7 @@ public class Jar extends Zip {
      */
     public void setFilesetmanifest(FilesetManifestConfig config) {
         filesetManifestConfig = config;
-        mergeManifestsMain = "merge".equals(config.getValue());
+        mergeManifestsMain = config != null && "merge".equals(config.getValue());
 
         if (filesetManifestConfig != null
             && !filesetManifestConfig.getValue().equals("skip")) {


Mime
View raw message