sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1665140 - /sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java
Date Mon, 09 Mar 2015 07:58:27 GMT
Author: cziegeler
Date: Mon Mar  9 07:58:26 2015
New Revision: 1665140

URL: http://svn.apache.org/r1665140
Log:
SLING-4482 : Settings plugin might not show current values for sling properties

Modified:
    sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java

Modified: sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java?rev=1665140&r1=1665139&r2=1665140&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java
(original)
+++ sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingPropertiesPrinter.java
Mon Mar  9 07:58:26 2015
@@ -58,7 +58,15 @@ public class SlingPropertiesPrinter {
                 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);
             }



Mime
View raw message