You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by fm...@apache.org on 2011/09/02 23:58:02 UTC

svn commit: r1164733 - /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java

Author: fmeschbe
Date: Fri Sep  2 21:58:02 2011
New Revision: 1164733

URL: http://svn.apache.org/viewvc?rev=1164733&view=rev
Log: (empty)

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java?rev=1164733&r1=1164732&r2=1164733&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java Fri Sep  2 21:58:02 2011
@@ -542,6 +542,11 @@ public class Sling {
             // copy the values into a temporary properties structure to store
             Properties tmp = new Properties();
             tmp.putAll(staticProps);
+
+            // remove properties where overlay makes no sense
+            tmp.remove(SharedConstants.SLING_HOME);
+            tmp.remove(SharedConstants.SLING_PROPERTIES);
+
             tmp.store(os, "Overlay properties for configuration");
         } catch (Exception ex) {
             this.logger.log(Logger.LOG_ERROR,