dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double version increment when creating device profiles

Browse Source
This commit is contained in:
VIacheslavKlimov 2025-07-23 19:03:09 +03:00
parent 24ff462b31
commit 223aae58ea
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
View File

@ -97,6 +97,11 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
entity = update(entity); entity = update(entity);
} }
if (entity instanceof HasVersion versionedEntity) { if (entity instanceof HasVersion versionedEntity) {
/*
* by default, Hibernate doesn't issue an update query and thus version increment
* if the entity was not modified. to bypass this and always increment the version, we do it manually
* */
versionedEntity.setVersion(versionedEntity.getVersion() + 1);
/* /*
* flushing and then removing the entity from the persistence context so that it is not affected * flushing and then removing the entity from the persistence context so that it is not affected
* by next flushes (e.g. when a transaction is committed) to avoid double version increment * by next flushes (e.g. when a transaction is committed) to avoid double version increment
@ -113,7 +118,7 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
private E create(E entity) { private E create(E entity) {
if (entity instanceof HasVersion versionedEntity) { if (entity instanceof HasVersion versionedEntity) {
versionedEntity.setVersion(1L); versionedEntity.setVersion(0L);
} }
if (entity.getUuid() == null) { if (entity.getUuid() == null) {
getEntityManager().persist(entity); getEntityManager().persist(entity);
@ -147,11 +152,6 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
} }
versionedEntity = entityManager.merge(versionedEntity); versionedEntity = entityManager.merge(versionedEntity);
entity = (E) versionedEntity; entity = (E) versionedEntity;
/*
* by default, Hibernate doesn't issue an update query and thus version increment
* if the entity was not modified. to bypass this and always increment the version, we do it manually
* */
versionedEntity.setVersion(versionedEntity.getVersion() + 1);
} else { } else {
entity = entityManager.merge(entity); entity = entityManager.merge(entity);
} }