/** * {@inheritDoc} */ public void recordAsSynchronized(IEntity flushedEntity) { if (unitOfWork.isActive()) { unitOfWork.clearDirtyState(flushedEntity); entitiesToMergeBack.add(flushedEntity); } }
+ message); unitOfWork.clearDirtyState(flushedEntity); if (isEntityRegisteredForDeletion(flushedEntity)) { if (IEntity.DELETED_VERSION.equals(flushedEntity.getVersion())) {
if (mergeMode == EMergeMode.MERGE_CLEAN_EAGER || mergeMode == EMergeMode.MERGE_CLEAN_LAZY || mergeMode == EMergeMode.MERGE_LAZY) { sessionUnitOfWork.clearDirtyState(entity); sessionUnitOfWork.clearDirtyState(entity);