From 82c2c3331228ce38f5bd1927f550ec6caa1fa7f3 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Wed, 11 Apr 2018 17:48:09 +0200
Subject: [PATCH] Merge ifs

---
 src/main/org/apache/tools/ant/util/ScriptRunnerBase.java | 7 ++-----
 1 file changed, 2 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 91aefa451..eae129df6 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
@@ -92,11 +92,8 @@ 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() || !Character.isJavaIdentifierStart(key.charAt(0))) {
-            return;
-        }
-
-        if (!key.chars().skip(1).allMatch(Character::isJavaIdentifierPart)) {
+        if (key.isEmpty() || !Character.isJavaIdentifierStart(key.charAt(0))
+                || !key.chars().skip(1).allMatch(Character::isJavaIdentifierPart)) {
             return;
         }