Changeset 4478 in josm

Timestamp:

Sep 30, 2011 9:02:33 PM (21 months ago)

Author:

Don-vip

Message:

fix #5374 and #6315 - NPE in relations conflict manager

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java

@@ -34 +34 @@
 
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+        // Do not edit empty or incomplete members ! (fix #5374 and #6315)
+        if (value == null)
+            return null;
+
         RelationMember member = (RelationMember)value;