Repository: ant Updated Branches: refs/heads/master a5ed6946a -> cc335d3a4
Revert incorrect validation rule using streams Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/cc335d3a Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/cc335d3a Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/cc335d3a Branch: refs/heads/master Commit: cc335d3a4e1a0fdd1d46bc04fc2937b413bf7d97 Parents: a5ed694 Author: Gintas Grigelionis <gin...@apache.org> Authored: Wed Apr 11 07:41:31 2018 +0200 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Wed Apr 11 08:11:33 2018 +0200 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/util/ScriptRunnerBase.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/cc335d3a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java index 6e6ea9d..91aefa4 100644 --- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java +++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java @@ -92,14 +92,12 @@ public abstract class ScriptRunnerBase { * @param bean the object to be stored in the script context. */ public void addBean(String key, Object bean) { - if (key.isEmpty()) { + if (key.isEmpty() || !Character.isJavaIdentifierStart(key.charAt(0))) { return; } - for (char ch : key.toCharArray()) { - if (!Character.isJavaIdentifierPart(ch)) { - return; - } + if (!key.chars().skip(1).allMatch(Character::isJavaIdentifierPart)) { + return; } beans.put(key, bean);
