Revision 0694bb3d
Added by Andreas Müller almost 2 years ago
| cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java | ||
|---|---|---|
| 82 | 82 |
Class<?> entityClazz = entity.getClass(); |
| 83 | 83 |
|
| 84 | 84 |
if (TaxonNode.class.isAssignableFrom(entityClazz)){
|
| 85 |
TaxonNode node = (TaxonNode)entity; |
|
| 86 |
// node.removeNullValueFromChildren(); |
|
| 85 |
//do nothing (remove if #8127/#3722 is fully solved |
|
| 87 | 86 |
} else if (PolytomousKeyNode.class.isAssignableFrom(entityClazz)){
|
| 88 | 87 |
PolytomousKeyNode node = (PolytomousKeyNode) entity; |
| 89 | 88 |
if (node.getChildren() != null && Hibernate.isInitialized(node.getChildren()) ){
|
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java | ||
|---|---|---|
| 50 | 50 |
import eu.etaxonomy.cdm.compare.taxon.HomotypicGroupTaxonComparator; |
| 51 | 51 |
import eu.etaxonomy.cdm.compare.taxon.TaxonNodeSortMode; |
| 52 | 52 |
import eu.etaxonomy.cdm.filter.TaxonNodeFilter; |
| 53 |
import eu.etaxonomy.cdm.hibernate.HHH_9751_Util; |
|
| 54 | 53 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 55 | 54 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
| 56 | 55 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| ... | ... | |
| 166 | 165 |
} |
| 167 | 166 |
} |
| 168 | 167 |
|
| 169 |
HHH_9751_Util.removeAllNull(childNodes); |
|
| 170 |
|
|
| 171 | 168 |
if (recursive == false && sortMode != null){
|
| 172 | 169 |
Comparator<TaxonNode> comparator = sortMode.comparator(); |
| 173 | 170 |
Collections.sort(childNodes, comparator); |
| ... | ... | |
| 1418 | 1415 |
//add children |
| 1419 | 1416 |
if (config.isDoRecursive()){
|
| 1420 | 1417 |
List<TaxonNode> originalChildNodes = originalParentNode.getChildNodes(); |
| 1421 |
HHH_9751_Util.removeAllNull(originalChildNodes); |
|
| 1422 | 1418 |
|
| 1423 | 1419 |
for (TaxonNode originalChildNode : originalChildNodes) {
|
| 1424 | 1420 |
cloneTaxonRecursive(originalChildNode, childNodeClone, config); |
Also available in: Unified diff
ref #10067, ref #8127 remove remaining null value handling from taxon node