commit 8990dc2c302f60eb79e6c545de9ad2d37c9107df
author Robert Munteanu <rombert@apache.org> Fri Sep 04 16:53:29 2020 +0200
committer Robert Munteanu <robert.munteanu@gmail.com> Tue Sep 08 18:02:43 2020 +0300
tree eeb97f02f4c5b47a4e65582e6cd0c75b59b7bbaf
parent 4d71eb2effe2ce267883ef93769953cb7774632e

SLING-9684 - Support resolving variables within variables

Simplify FeatureBuilder.replaceVariables

src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java

diff --git a/src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java b/src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java
index 8f412d7..21e08b1 100644
--- a/src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java
+++ b/src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java
@@ -270,10 +270,11 @@
 
             final int len = var.length();
             final String name = var.substring(2, len - 1);
-            if (BuilderUtil.contains(name, feature.getVariables().entrySet())) {
+            
+            if (feature.getVariables().containsKey(name)) {
                 String val = null;
                 if (additionalVariables != null)
-                    val = BuilderUtil.get(name, additionalVariables.entrySet());
+                    val = additionalVariables.get(name);
                 if (val == null) {
                     val = feature.getVariables().get(name);
                 }