diff options
| author | Stefan Bodewig <bodewig@apache.org> | 2016-12-21 11:22:23 +0100 |
|---|---|---|
| committer | Stefan Bodewig <bodewig@apache.org> | 2016-12-21 11:22:23 +0100 |
| commit | 64d1056c41516ea0a35e8b7c9d9efaab4153027a (patch) | |
| tree | 80c78388899e63126a978082391e797e9936ce9f /src | |
| parent | eaf3af0aea8b14c4a5d8d63bc4cb22f88dbb19a4 (diff) | |
| download | ant-64d1056c41516ea0a35e8b7c9d9efaab4153027a.tar.gz | |
uncover hidden NullPointerException
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/org/apache/tools/ant/taskdefs/Jar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index a0337e1f1..330b5dd7d 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")) { |