From cc335d3a4e1a0fdd1d46bc04fc2937b413bf7d97 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Wed, 11 Apr 2018 07:41:31 +0200
Subject: [PATCH] Revert incorrect validation rule using streams

---
 src/main/org/apache/tools/ant/util/ScriptRunnerBase.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
index 6e6ea9d46..91aefa451 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);