jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

fixed borken update (entity, updatedBy) method

Browse Source
This commit is contained in:
Joern Muehlencord
2019-08-14 12:02:51 +02:00
parent 08a0adcc6f
commit 0f98586434
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
db/src/main/java/de/muehlencord/shared/db/CommonAbstractController.java
View File

@ -138,15 +138,14 @@ public abstract class CommonAbstractController {
@Lock(LockType.WRITE) @Lock(LockType.WRITE)
public <T extends Serializable> T update(T entity, String updatedBy) throws ControllerException { public <T extends Serializable> T update(T entity, String updatedBy) throws ControllerException {
T currentEntity = executeUpdate(entity, updatedBy); T currentEntity = executeUpdate(entity, updatedBy);
T newEntity = EntityUtil.cloneToNewEntity(currentEntity);
if (EndDateable.class.isAssignableFrom(entity.getClass())) { if (EndDateable.class.isAssignableFrom(entity.getClass())) {
T newEntity = EntityUtil.cloneToNewEntity(currentEntity);
em.merge(currentEntity); em.merge(currentEntity);
return create(newEntity, updatedBy); return create(newEntity, updatedBy);
} else { } else {
// if it is not enddatable, just update it (already done above) // if it is not enddatable, just update it (already done above)
// and save it // and save it
return em.merge(entity); return em.merge(currentEntity);
} }
} }