Changeset 11493 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-01-25T14:12:07+01:00 (8 years ago)

Author:

Don-vip

Message:

see #12627, see #14289 - add non regression unit tests

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (2 diffs)

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

@@ -207 +207 @@
         File file = getFile();
         if (file == null) {
-            if (name.startsWith("resource://")) {
+            if (name != null && name.startsWith("resource://")) {
                 InputStream is = getClass().getResourceAsStream(
                         name.substring("resource:/".length()));
@@ -273 +273 @@
             }
         } catch (MalformedURLException e) {
-            if (name.startsWith("resource://")) {
+            if (name == null || name.startsWith("resource://")) {
                 return null;
             } else if (name.startsWith("josmdir://")) {