Revision e0cc4f18
Added by Andreas Müller almost 4 years ago
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java | ||
---|---|---|
46 | 46 |
// if the cdm identifier set contains identifiers of objects already |
47 | 47 |
// present in the updated objects set remove them |
48 | 48 |
for(CdmBase updatedObject : updatedObjects) { |
49 |
if(updatedObject != null && exists(new CdmEntityCacheKey<>(updatedObject))) { |
|
50 |
CdmEntityIdentifier cdmEntityIdentifier = new CdmEntityIdentifier(updatedObject.getId(), updatedObject.getClass()); |
|
51 |
if(!updatedCdmIdsIsEmpty && updatedCdmIds.contains(cdmEntityIdentifier)) { |
|
52 |
updatedCdmIds.remove(cdmEntityIdentifier); |
|
49 |
if(updatedObject != null) { |
|
50 |
if (exists(new CdmEntityCacheKey<>(updatedObject))){ |
|
51 |
CdmEntityIdentifier cdmEntityIdentifier = new CdmEntityIdentifier(updatedObject.getId(), updatedObject.getClass()); |
|
52 |
if(!updatedCdmIdsIsEmpty && updatedCdmIds.contains(cdmEntityIdentifier)) { |
|
53 |
updatedCdmIds.remove(cdmEntityIdentifier); |
|
54 |
} |
|
53 | 55 |
} |
56 |
reloadedObjects.add(load(updatedObject, update)); |
|
54 | 57 |
} |
55 |
reloadedObjects.add(load(updatedObject, update)); |
|
56 | 58 |
} |
57 | 59 |
|
58 | 60 |
// remote load cdm identifiers of objects which already exist |
Also available in: Unified diff
ref #9078 further improve null entity handling in ConversationalTransientEntityCacher (just in case)