Author: sseifert
Date: Tue Jul 14 10:01:53 2015
New Revision: 1690894
URL: http://svn.apache.org/r1690894
Log:
SLING-4807 make sure variable replacement is applied whether custom resolver
exists or not
Modified:
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
Modified:
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java?rev=1690894&r1=1690893&r2=1690894&view=diff
==============================================================================
---
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
(original)
+++
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
Tue Jul 14 10:01:53 2015
@@ -30,6 +30,9 @@ import org.apache.felix.cm.file.Configur
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 {
