Revision 64367d00
Added by Katja Luther over 8 years ago
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java | ||
---|---|---|
966 | 966 |
if (config == null){ |
967 | 967 |
config = new TaxonDeletionConfigurator(); |
968 | 968 |
} |
969 |
Taxon taxon = (Taxon)dao.load(taxonUUID);
|
|
970 |
taxon = (Taxon) HibernateProxyHelper.deproxy(taxon); |
|
969 |
Taxon taxon = HibernateProxyHelper.deproxy(dao.load(taxonUUID), Taxon.class);
|
|
970 |
|
|
971 | 971 |
Classification classification = HibernateProxyHelper.deproxy(classificationDao.load(classificationUuid), Classification.class); |
972 | 972 |
DeleteResult result = isDeletable(taxon, config); |
973 | 973 |
|
... | ... | |
1144 | 1144 |
}else { |
1145 | 1145 |
taxon.setName(null); |
1146 | 1146 |
} |
1147 |
|
|
1148 |
|
|
1147 |
this.saveOrUpdate(taxon); |
|
1148 |
|
|
1149 | 1149 |
// TaxonDescription |
1150 | 1150 |
/* Set<TaxonDescription> descriptions = taxon.getDescriptions(); |
1151 | 1151 |
|
... | ... | |
1166 | 1166 |
|
1167 | 1167 |
if ((taxon.getTaxonNodes() == null || taxon.getTaxonNodes().size()== 0) ){ |
1168 | 1168 |
try{ |
1169 |
//taxon = HibernateProxyHelper.deproxy(taxon, Taxon.class); |
|
1169 | 1170 |
UUID uuid = dao.delete(taxon); |
1170 | 1171 |
|
1171 | 1172 |
}catch(Exception e){ |
Also available in: Unified diff
minor