commit 6b8df254a4e7ee994428d3fb81a678afdbfd6e31
author Carsten Ziegeler <cziegeler@apache.org> Wed Oct 08 15:37:09 2014 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Oct 08 15:37:09 2014 +0000
tree 822256a87cda0f42d68f61af5a8ddbd2a4573fd5
parent a74e62a4d9ed4c30ea516315b6e0ee1e89e4de62

Fix special configuration handling and effective model retrival

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1630146 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java

diff --git a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
index cb079c9..3df257f 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
@@ -279,7 +279,7 @@
         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);