Project

General

Profile

« Previous | Next » 

Revision a5a14935

Added by Katja Luther almost 6 years ago

Revert "revert additional load of taxa in set secundum"

This reverts commit b04bb7755d1331fcce1d0693f23d063b2d8ad7f0.

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
44 44
import eu.etaxonomy.cdm.persistence.dao.taxon.IClassificationDao;
45 45
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;
46 46
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonNodeDao;
47
import eu.etaxonomy.cdm.persistence.dto.MergeResult;
47 48
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
48 49
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
49 50

  
......
512 513
        Query query = getSession().createQuery(queryStr);
513 514
        @SuppressWarnings("unchecked")
514 515
        List<T> synonymList = query.list();
516
        MergeResult mergeResult;
515 517
        Set<T> result = new HashSet<>();
516 518
        for (T taxonBase : synonymList){
517 519
            if (taxonBase != null){
520
                taxonBase = (T) taxonDao.load(taxonBase.getUuid());
518 521
                taxonBase.setSec(newSec);
519 522
                if (emptyDetail){
520 523
                    taxonBase.setSecMicroReference(null);

Also available in: Unified diff