Changeset 13402 in josm for trunk/src

Timestamp:

2018-02-10T15:07:48+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15901 - --load-preferences crashes on simple filename

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -22 +22 @@
 import java.net.ProxySelector;
 import java.net.URL;
+import java.nio.file.Paths;
 import java.security.AllPermission;
 import java.security.CodeSource;
@@ -169 +170 @@
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.bugreport.BugReportQueue;
@@ -954 +954 @@
             XMLCommandProcessor config = new XMLCommandProcessor(Main.pref);
             for (String i : args.get(Option.LOAD_PREFERENCES)) {
-                Logging.info("Reading preferences from " + i);
-                try (InputStream is = Utils.openStream(new URL(i))) {
-                    config.openAndReadXML(is);
+                try {
+                    URL url = i.contains("://") ? new URL(i) : Paths.get(i).toUri().toURL();
+                    Logging.info("Reading preferences from " + url);
+                    try (InputStream is = Utils.openStream(url)) {
+                        config.openAndReadXML(is);
+                    }
                 } catch (IOException ex) {
-                    throw BugReport.intercept(ex).put("file", i);
+                    Logging.error(ex);
+                    return;
                 }
             }