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

Timestamp:

2016-04-10T12:56:01+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12720 - fix potential NPEs

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/TagEditHelper.java (modified) (1 diff)
• tagging/ac/AutoCompletingComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -589 +589 @@
                 cb.requestFocusInWindow();
                 cb.getEditor().selectAll();
-                sysSel.setContents(old, null);
+                if (old != null) {
+                    sysSel.setContents(old, null);
+                }
             } else {
                 cb.requestFocusInWindow();

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -203 +203 @@
                             Transferable old = Utils.getTransferableContent(sysSel);
                             editorComponent.selectAll();
-                            sysSel.setContents(old, null);
+                            if (old != null) {
+                                sysSel.setContents(old, null);
+                            }
                         } else {
                             editorComponent.selectAll();