Changeset 9087 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

Timestamp:

2015-12-05T16:09:41+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - fix some errors, mainly NPEs

File:

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

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

@@ -413 +413 @@
             if (e == null) {
                 error(tr("missing layer with index {0}", idx));
-            }
-            if (!e.hasAttribute("name")) {
+                return;
+            } else if (!e.hasAttribute("name")) {
                 error(tr("missing mandatory attribute ''name'' for element ''layer''"));
+                return;
             }
             String name = e.getAttribute("name");
@@ -421 +422 @@
             if (!e.hasAttribute("type")) {
                 error(tr("missing mandatory attribute ''type'' for element ''layer''"));
+                return;
             }
             String type = e.getAttribute("type");