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

[gnodet]

Author: gnodet
Date: Mon Jun  6 16:06:54 2011
New Revision: 1132690

URL: http://svn.apache.org/viewvc?rev=1132690&view=rev
Log:
[FELIX-2982] noInitialDelay option does not work

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

Modified: 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java?rev=1132690&r1=1132689&r2=1132690&view=diff
==============================================================================
--- 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
 (original)
+++ 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
 Mon Jun  6 16:06:54 2011
@@ -244,6 +244,13 @@ public class DirectoryWatcher extends Th
 
         if (!noInitialDelay)
         {
+            try {
+                // enforce a delay before the first directory scan
+                Thread.sleep(poll);
+            } catch (InterruptedException e) {
+                log(Logger.LOG_DEBUG, "Watcher for " + watchedDirectory + " 
was interrupted while waiting "
+                    + poll + " milliseconds for initial directory scan.", e);
+            }
             initializeCurrentManagedBundles();
         }