Changeset 11589 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-02-20T21:40:33+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14391 - robustness to Linux systems preventing file watcher to start because of incorrect kernel inotify watch configuration

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (1 diff)
• io/FileWatcher.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -752 +752 @@
                     Main.fileWatcher.registerValidatorRule(source);
                 }
-            } catch (IOException ex) {
+            } catch (IOException | IllegalStateException ex) {
                 Main.warn(tr("Failed to add {0} to tag checker", i));
                 Main.warn(ex, false);

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -274 +274 @@
             try {
                 Main.fileWatcher.registerStyleSource(source);
-            } catch (IOException e) {
+            } catch (IOException | IllegalStateException e) {
                 Main.error(e);
             }

trunk/src/org/openstreetmap/josm/io/FileWatcher.java

@@ -52 +52 @@
      */
     public final void start() {
-        if (!thread.isAlive()) {
+        if (thread != null && !thread.isAlive()) {
             thread.start();
         }