commit 91c8c18309f1e985970a8c25484a7a45f080b5e0
author Carsten Ziegeler <cziegeler@apache.org> Mon Mar 09 07:58:26 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Mon Mar 09 07:58:26 2015 +0000
tree f483229f0020992304d7c1a675e6a4e3cd6efd41
parent 44740b431cadee30e2654bc9f7c8397a22720596

SLING-4482 : Settings plugin might not show current values for sling properties

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

src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java

diff --git a/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java b/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java
index de2606b..6ad1bab 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java
@@ -58,7 +58,15 @@
                 final InputStream is = url.openStream();
                 final Properties tmp = new Properties();
                 tmp.load(is);
+                // update props
+                for(final Object key : tmp.keySet()) {
+                    final Object value = bundleContext.getProperty(key.toString());
+                    if ( value != null ) {
+                        tmp.put(key, value);
+                    }
+                }
                 props = tmp;
+
             } catch (IOException ioe) {
                 LOGGER.warn("Unable to read sling properties from " + propUrl, ioe);
             }