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

Timestamp:

2017-03-01T23:28:34+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14157 - NPE opening a session

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SessionLoadAction.java (modified) (1 diff)
• io/session/SessionReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java

@@ -138 +138 @@
 
         private void runPostLoadTasks() {
-            for (Runnable task : postLoadTasks) {
-                if (canceled)
-                    return;
-                if (task == null) {
-                    continue;
+            if (postLoadTasks != null) {
+                for (Runnable task : postLoadTasks) {
+                    if (canceled)
+                        return;
+                    if (task == null) {
+                        continue;
+                    }
+                    task.run();
                 }
-                task.run();
             }
         }

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -256 +256 @@
                 } else
                     throw new IOException(tr("Unsupported scheme ''{0}'' in URI ''{1}''.", uri.getScheme(), uriStr));
-            } catch (URISyntaxException e) {
+            } catch (URISyntaxException | IllegalArgumentException e) {
                 throw new IOException(e);
             }