You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/10/08 17:37:09 UTC
svn commit: r1630146 -
/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
Author: cziegeler
Date: Wed Oct 8 15:37:09 2014
New Revision: 1630146
URL: http://svn.apache.org/r1630146
Log:
Fix special configuration handling and effective model retrival
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java?rev=1630146&r1=1630145&r2=1630146&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java Wed Oct 8 15:37:09 2014
@@ -279,7 +279,7 @@ public abstract class ModelUtils {
if ( result == null ) {
final String contents = (String)project.getContextValue(EFFECTIVE_MODEL_TXT);
try {
- result = ModelReader.read(new StringReader(contents), null);
+ result = ModelUtility.getEffectiveModel(ModelReader.read(new StringReader(contents), null), null);
project.setContextValue(EFFECTIVE_MODEL, result);
} catch ( final IOException ioe) {
throw new MojoExecutionException("Unable to read cached model.", ioe);