X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.fileimport%2Fsrc%2Forg%2Fsimantics%2Ffileimport%2Fdropins%2FFileImportDropins.java;h=6c07f92aaffcdfee2e40cab47714a34ec9b41fca;hp=21a9f9ab0152fd5fab5d5a6d84d50e553d2a047f;hb=ffdf83729b496d5afe74c7888075bb17ce1c4bbb;hpb=b809a171b6dfb81ed9ef9e84870dcbcbc5912f0e

diff --git a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java
index 21a9f9ab0..6c07f92aa 100644
--- a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java
+++ b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/dropins/FileImportDropins.java
@@ -5,6 +5,7 @@ import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
 import static java.nio.file.StandardWatchEventKinds.OVERFLOW;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.file.FileSystem;
@@ -59,6 +60,8 @@ public class FileImportDropins {
      * Stop watching the dropins folder
      */
     public static void unwatchDropinsFolder() {
+        if (watcher == null)
+            return;
         watcher.stop();
         try {
             watcherThread.join(500);
@@ -139,7 +142,7 @@ public class FileImportDropins {
                             }
                             
                             FileImportService.performFileImport(newPath, Optional.of(t -> {
-                                if (t instanceof FileSystemException) {
+                                if ((t instanceof FileSystemException) || (t instanceof FileNotFoundException)) {
                                     try {
                                         syncPath(newPath);
                                     } catch (IOException e) {