You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2020/09/08 15:02:53 UTC
[sling-org-apache-sling-feature] 02/02: SLING-9684 - Support
resolving variables within variables
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git
commit 8990dc2c302f60eb79e6c545de9ad2d37c9107df
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Sep 4 16:53:29 2020 +0200
SLING-9684 - Support resolving variables within variables
Simplify FeatureBuilder.replaceVariables
---
src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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 @@ public abstract class FeatureBuilder {
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);
}