Changeset 12550 in josm for trunk/src

Timestamp:

2017-08-01T00:59:21+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeNodesAction.java (modified) (2 diffs)
• data/imagery/WMTSTileSource.java (modified) (1 diff)

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

@@ -87 +87 @@
 
         Node targetNode = selectTargetNode(selectedNodes);
-        Node targetLocationNode = selectTargetLocationNode(selectedNodes);
-        Command cmd = mergeNodes(Main.getLayerManager().getEditLayer(), selectedNodes, targetNode, targetLocationNode);
-        if (cmd != null) {
-            Main.main.undoRedo.add(cmd);
-            Main.getLayerManager().getEditLayer().data.setSelected(targetNode);
+        if (targetNode != null) {
+            Node targetLocationNode = selectTargetLocationNode(selectedNodes);
+            Command cmd = mergeNodes(Main.getLayerManager().getEditLayer(), selectedNodes, targetNode, targetLocationNode);
+            if (cmd != null) {
+                Main.main.undoRedo.add(cmd);
+                Main.getLayerManager().getEditLayer().data.setSelected(targetNode);
+            }
         }
     }
@@ -265 +267 @@
         }
 
-        Command cmd = mergeNodes(layer, nodes, target, targetLocationNode);
-        if (cmd != null) {
-            Main.main.undoRedo.add(cmd);
-            layer.data.setSelected(target);
+        if (target != null) {
+            Command cmd = mergeNodes(layer, nodes, target, targetLocationNode);
+            if (cmd != null) {
+                Main.main.undoRedo.add(cmd);
+                layer.data.setSelected(target);
+            }
         }
     }

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -684 +684 @@
             } // else: keep currentLayer and tileProjection as is
         }
-        this.currentTileMatrixSet = this.currentLayer.tileMatrixSet;
-        Collection<Double> scales = new ArrayList<>(currentTileMatrixSet.tileMatrix.size());
-        for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
-            scales.add(tileMatrix.scaleDenominator * 0.28e-03);
-        }
-        this.nativeScaleList = new ScaleList(scales);
+        if (this.currentLayer != null) {
+            this.currentTileMatrixSet = this.currentLayer.tileMatrixSet;
+            Collection<Double> scales = new ArrayList<>(currentTileMatrixSet.tileMatrix.size());
+            for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
+                scales.add(tileMatrix.scaleDenominator * 0.28e-03);
+            }
+            this.nativeScaleList = new ScaleList(scales);
+        }
         this.crsScale = getTileSize() * 0.28e-03 / this.tileProjection.getMetersPerUnit();
     }