svn commit: r743514 - /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java

[ri...@apache.org]

Author: rickhall
Date: Wed Feb 11 21:27:08 2009
New Revision: 743514

URL: http://svn.apache.org/viewvc?rev=743514&view=rev
Log:
Applied patch (FELIX-926) to have File Install read all its config properties
from the properties object.

Modified:
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java

Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java?rev=743514&r1=743513&r2=743514&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java Wed Feb 11 21:27:08 2009
@@ -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
+}