Project

General

Profile

Revision b8412039

IDb8412039585c1b40722703358b1f23aacdfa34cb
Parent 42002c0a
Child bd45d1fc

Added by Patrick Plitzner almost 3 years ago

ref #7095 Fix NPE in specimen selection dialog

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/WorkingSetService.java
172 172
                country = fieldUnit.getGatheringEvent().getCountry();
173 173
            }
174 174
        }
175
        return new RowWrapperDTO(description, taxonNode, fieldUnit, identifier, country);
175
        return new RowWrapperDTO(description, specimen, taxonNode, fieldUnit, identifier, country);
176 176
	}
177 177
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java
46 46
    private NamedArea country;
47 47
    private Map<Feature, DescriptionElementBase> featureToElementMap;
48 48

  
49
    public RowWrapperDTO(DescriptionBase description, TaxonNode taxonNode, FieldUnit fieldUnit, String identifier,
50
            NamedArea country) {
49
    public RowWrapperDTO(DescriptionBase description, SpecimenOrObservationBase specimen, TaxonNode taxonNode, FieldUnit fieldUnit, String identifier,
50
                NamedArea country) {
51 51
        this.taxonNode = taxonNode;
52 52
        this.fieldUnit = fieldUnit;
53 53
        this.identifier = identifier;
......
56 56
        if(description!=null){
57 57
            setDescription(description);
58 58
        }
59
        else if(specimen!=null){
60
            this.specimen = specimen;
61
        }
59 62
    }
60 63

  
61 64
    public QuantitativeData addQuantitativeData(Feature feature){

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)