Changeset 35730 in osm for applications/viewer

Timestamp:

2021-03-16T18:45:07+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20557 - NPE (patch by taylor.smock)

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java

@@ -4 +4 @@
 import java.awt.BorderLayout;
 import java.awt.event.MouseAdapter;
+import java.util.Objects;
 
 import javax.swing.JFrame;
@@ -151 +152 @@
         for (int i = 0; i < node.getChildCount(); i++) {
             DefaultMutableTreeNode childNode = node(node.getChildAt(i));
-            if (!data(childNode).isSelected().equals(data(node).isSelected())) {
+            // Fix NPE from #20557
+            final CheckBoxNodeData childData = data(childNode);
+            final CheckBoxNodeData nodeData = data(node);
+            if (childData != null && nodeData != null &&
+                    !Objects.equals(childData.isSelected(), nodeData.isSelected())) {
                 data(childNode).setSelected(data(node).isSelected());
                 setChildrens(childNode, value);