Author: gnodet
Date: Tue Dec 15 16:27:29 2015
New Revision: 1720189
URL: http://svn.apache.org/viewvc?rev=1720189&view=rev
Log:
[FELIX-4906] Changes in symlinked bundles not detected with NIO2 WatcherScanner
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Watcher.java
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Watcher.java
URL:
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Watcher.java?rev=1720189&r1=1720188&r2=1720189&view=diff
==============================================================================
---
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Watcher.java
(original)
+++
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Watcher.java
Tue Dec 15 16:27:29 2015
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
+import java.nio.file.FileVisitOption;
import java.nio.file.FileVisitResult;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
@@ -34,6 +35,7 @@ import java.nio.file.WatchKey;
import java.nio.file.WatchService;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -150,7 +152,10 @@ public abstract class Watcher implements
key.cancel();
}
keys.clear();
- Files.walkFileTree(root, new FilteringFileVisitor());
+ Files.walkFileTree(root,
+ EnumSet.of(FileVisitOption.FOLLOW_LINKS),
+ Integer.MAX_VALUE,
+ new FilteringFileVisitor());
}
public void processEvents() {
