Applied patch (FELIX-926) to have File Install read all its config properties
from the properties object.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@743514 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
index 1053fec..370e964 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
@@ -51,8 +51,8 @@
{
super(properties.toString());
this.context = context;
- poll = getLong(POLL, poll);
- debug = getLong(DEBUG, -1);
+ poll = getLong(properties, POLL, poll);
+ debug = getLong(properties, DEBUG, -1);
String dir = (String) properties.get(DIR);
if (dir == null)
@@ -541,9 +541,9 @@
* @param dflt
* @return
*/
- long getLong(String property, long dflt)
+ long getLong(Dictionary properties, String property, long dflt)
{
- String value = context.getProperty(property);
+ String value = (String) properties.getProperty(property);
if (value != null)
{
try
@@ -570,4 +570,4 @@
// Ignore
}
}
-}
\ No newline at end of file
+}