summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Bodewig <bodewig@apache.org>2017-03-15 17:51:41 +0100
committerStefan Bodewig <bodewig@apache.org>2017-03-15 17:51:41 +0100
commitc47bf80f005df86392f77e755c0310c11305bcfa (patch)
treea047f065f175a44c24ec6d57a8429dedf7bf7d92 /src
parent2c4c28cd440ceff0fe517de99f5291a63b35004b (diff)
parent5ef86aed605c8d3ca4b376eab74e255166f7bf4d (diff)
downloadant-c47bf80f005df86392f77e755c0310c11305bcfa.tar.gz
Merge branch '1.9.x'
Diffstat (limited to 'src')
-rw-r--r--src/main/org/apache/tools/ant/taskdefs/GenerateKey.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index 69e719ce7..c26ac3621 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -73,6 +73,10 @@ public class GenerateKey extends Task {
public String getValue() {
return value;
}
+
+ public boolean isComplete() {
+ return name != null && value != null;
+ }
}
/**
@@ -119,9 +123,11 @@ public class GenerateKey extends Task {
firstPass = false;
final DnameParam param = (DnameParam) params.elementAt(i);
- sb.append(encode(param.getName()));
- sb.append('=');
- sb.append(encode(param.getValue()));
+ if (param.isComplete()) {
+ sb.append(encode(param.getName()));
+ sb.append('=');
+ sb.append(encode(param.getValue()));
+ }
}
return sb.toString();