Prevent file system access for WatchService DELETE events in FolderObserver

Signed-off-by: Ravi Nadahar <[email protected]>

Author: Ravi Nadahar

bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java

@@ -236,7 +236,19 @@ public boolean accept(Path entry) throws IOException {
     }
 
     private void checkPath(final Path path, final WatchService.Kind kind) {
+        String fileName = path.getFileName().toString();
         try {
+            // Checking isHidden() on a deleted file will throw an IOException on some file systems,
+            // so deal with deletion first.
+            if (kind == DELETE) {
+                synchronized (FolderObserver.class) {
+                    modelRepository.removeModel(fileName);
+                    namePathMap.remove(fileName);
+                    logger.debug("Removed '{}' model ", fileName);
+                }
+                return;
+            }
+
             if (Files.isHidden(path)) {
                 // we omit parsing of hidden files possibly created by editors or operating systems
                 if (logger.isDebugEnabled()) {
@@ -246,7 +258,6 @@ private void checkPath(final Path path, final WatchService.Kind kind) {
             }
 
             synchronized (FolderObserver.class) {
-                String fileName = path.getFileName().toString();
                 if (kind == CREATE || kind == MODIFY) {
                     String extension = getExtension(fileName);
                     if (parsers.contains(extension)) {
@@ -267,10 +278,6 @@ private void checkPath(final Path path, final WatchService.Kind kind) {
                                     path.toAbsolutePath());
                         }
                     }
-                } else if (kind == WatchService.Kind.DELETE) {
-                    modelRepository.removeModel(fileName);
-                    namePathMap.remove(fileName);
-                    logger.debug("Removed '{}' model ", fileName);
                 }
             }
         } catch (Exception e) {