Browse Source

Make GenerateKey.DistinguishedName.toString more robust

https://bz.apache.org/bugzilla/show_bug.cgi?id=60767
master
Stefan Bodewig 8 years ago
parent
commit
5ef86aed60
2 changed files with 16 additions and 3 deletions
  1. +7
    -0
      WHATSNEW
  2. +9
    -3
      src/main/org/apache/tools/ant/taskdefs/GenerateKey.java

+ 7
- 0
WHATSNEW View File

@@ -8,6 +8,13 @@ Other changes:
values always get quoted. values always get quoted.
Github Pull Request #32 Github Pull Request #32


Fixed bugs:
-----------

* <genkey>'s <dname> child now skips <param>s that lack a key or
value.
Bugzilla Report 60767

Changes from Ant 1.9.8 TO Ant 1.9.9 Changes from Ant 1.9.8 TO Ant 1.9.9
=================================== ===================================




+ 9
- 3
src/main/org/apache/tools/ant/taskdefs/GenerateKey.java View File

@@ -73,6 +73,10 @@ public class GenerateKey extends Task {
public String getValue() { public String getValue() {
return value; return value;
} }

public boolean isComplete() {
return name != null && value != null;
}
} }


/** /**
@@ -119,9 +123,11 @@ public class GenerateKey extends Task {
firstPass = false; firstPass = false;


final DnameParam param = (DnameParam) params.elementAt(i); 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(); return sb.toString();


Loading…
Cancel
Save