Project

General

Profile

« Previous | Next » 

Revision 491f1f91

Added by Andreas Müller almost 3 years ago

ref #4311 fix collectorTitleCache handling in Team an in person2Team

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java
235 235 
        if (StringUtils.isNotBlank(person.getNomenclaturalTitle())){
236 236 
            team.setNomenclaturalTitleCache(person.getNomenclaturalTitle(), true);  //sets the protected flag always to true, this is necessary as long as person does not have a nomenclatural title cache; maybe setting the protected title itself is not necessary but does no harm
237 237 
        }
238 
        if (StringUtils.isNotBlank(person.getCollectorTitle())){
239 
            team.setCollectorTitleCache(person.getCollectorTitle(), true);  //sets the protected flag always to true, this is necessary as long as person does not have a collector title cache; maybe setting the protected title itself is not necessary but does no harm
240 
        }
238 241 

  		




  239
  242
  
    
        if (! genericDao.isMergeable(team, person, strategy)){


  		




  240
  243
  
    
			throw new MergeException("Person can not be transformed into team.");


  		












Also available in:  Unified diff