Changeset 6781 in josm for trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

Timestamp:

2014-01-29T23:59:25+01:00 (10 years ago)

Author:

Don-vip

Message:

validator - avoid FileNotFoundException when loading ignored errors

File:

• trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -167 +167 @@
         ignoredErrors.clear();
         if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {
-            BufferedReader in = null;
-            try {
-                in = new BufferedReader(new FileReader(getValidatorDir() + "ignorederrors"));
-                for (String line = in.readLine(); line != null; line = in.readLine()) {
-                    ignoredErrors.add(line);
+            File file = new File(getValidatorDir() + "ignorederrors");
+            if (file.exists()) {
+                BufferedReader in = null;
+                try {
+                    in = new BufferedReader(new FileReader(file));
+                    for (String line = in.readLine(); line != null; line = in.readLine()) {
+                        ignoredErrors.add(line);
+                    }
+                } catch (final FileNotFoundException e) {
+                    Main.debug(Main.getErrorMessage(e));
+                } catch (final IOException e) {
+                    Main.error(e);
+                } finally {
+                    Utils.close(in);
                 }
-            } catch (final FileNotFoundException e) {
-                Main.debug(Main.getErrorMessage(e));
-            } catch (final IOException e) {
-                Main.error(e);
-            } finally {
-                Utils.close(in);
             }
         }