Project

General

Profile

« Previous | Next » 

Revision d11716c6

Added by Patrick Plitzner over 8 years ago

Fix moving of derivatives with null parent (+test)

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
919 919
                derivate.setDerivedFrom(derivedFromNewOriginalEvent);
920 920
            }
921 921

  
922
            saveOrUpdate(from);
922
            if(from!=null){
923
                saveOrUpdate(from);
924
            }
923 925
            saveOrUpdate(to);
924 926
            result.setStatus(Status.OK);
925 927
            result.addUpdatedObject(from);
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
232 232
    }
233 233

  
234 234
    @Test
235
    @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="BlankDataSet.xml")
235 236
    public void testMoveDerivateNoParent(){
236 237
        DerivedUnit derivedUnit = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
237 238
        FieldUnit fieldUnit = FieldUnit.NewInstance();

Also available in: Unified diff