Merge branch '1.9.x'

2 files changed, 16 insertions, 3 deletions

diff --git a/WHATSNEW b/WHATSNEW
index beaf7d8db..86504f2c9 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -12,6 +12,13 @@ Other changes:
    compiled attribute to scriptdef.
    Github Pull Request #30
 
+Fixed bugs:
+-----------
+
+ * <genkey>'s <dname> child now skips <param>s that lack a key or
+   value.
+   Bugzilla Report 60767
+
 Changes from Ant 1.10.0 TO Ant 1.10.1
 =====================================
 
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();