Changeset 11321 in josm for trunk/src


Ignore:
Timestamp:
2016-11-27T02:16:45+01:00 (3 years ago)
Author:
Don-vip
Message:

fix #14049 - NPE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

    r11303 r11321  
    436436    @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {
    437437        // Remove purged primitives (fix #8639)
    438         for (TestError err : errors) {
    439             try {
    440                 err.getPrimitives().removeAll(event.getPrimitives());
    441             } catch (UnsupportedOperationException e) {
    442                 if (event.getPrimitives().containsAll(err.getPrimitives())) {
    443                     err.getPrimitives().clear();
    444                 } else {
    445                     Main.warn(e, "Unable to remove primitives from "+err+'.');
     438        if (errors != null) {
     439            for (TestError err : errors) {
     440                try {
     441                    err.getPrimitives().removeAll(event.getPrimitives());
     442                } catch (UnsupportedOperationException e) {
     443                    if (event.getPrimitives().containsAll(err.getPrimitives())) {
     444                        err.getPrimitives().clear();
     445                    } else {
     446                        Main.warn(e, "Unable to remove primitives from "+err+'.');
     447                    }
    446448                }
    447449            }
Note: See TracChangeset for help on using the changeset viewer.