Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
* @author Yanming Zhou
* @author Ernst-Jan van der Laan
* @author Diego Krupitza
* @author Seol-JY
*/
@Repository
@Transactional(readOnly = true)
Expand Down Expand Up @@ -196,14 +197,16 @@ public void delete(T entity) {

Class<?> type = ProxyUtils.getUserClass(entity);

T existing = (T) entityManager.find(type, entityInformation.getId(entity));

// if the entity to be deleted doesn't exist, delete is a NOOP
if (existing == null) {
if (entityManager.contains(entity)) {
entityManager.remove(entity);
return;
}

entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity));
// if the entity to be deleted doesn't exist, delete is a NOOP
T existing = (T) entityManager.find(type, entityInformation.getId(entity));
if (existing != null) {
entityManager.remove(entityManager.merge(entity));
}
}

@Override
Expand Down
Loading