This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 7d6e31f7d7cf68eb73cedb2b2859f37b88db7656 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Jul 14 10:01:53 2015 +0000 SLING-4807 make sure variable replacement is applied whether custom resolver exists or not git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1690894 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/provisioning/model/ModelResolveUtility.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java b/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java index bcc4526..43e9b0f 100644 --- a/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java +++ b/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java @@ -30,6 +30,9 @@ import org.apache.felix.cm.file.ConfigurationHandler; import org.apache.sling.provisioning.model.ModelUtility.ArtifactVersionResolver; import org.apache.sling.provisioning.model.ModelUtility.VariableResolver; +/** + * Helper methods for resolving variables and artifact versions in models. + */ class ModelResolveUtility { /** @@ -114,9 +117,7 @@ class ModelResolveUtility { // check for raw configuration String rawConfig = (String)config.getProperties().get(ModelConstants.CFG_UNPROCESSED); if ( rawConfig != null ) { - if ( resolver != null ) { - rawConfig = replace(feature, rawConfig, resolver); - } + rawConfig = replace(feature, rawConfig, resolver); if ( config.isSpecial() ) { newConfig.getProperties().put(config.getPid(), rawConfig); } else { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
