Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed calling tx.addOrUpdate() after tx.remove()

This commit is contained in:
Robert von Burg 2019-01-30 16:37:03 +01:00
parent 6d9a9464d8
commit 8c4a8b77f1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
View File

@ -950,7 +950,8 @@ public abstract class AbstractTransaction implements StrolchTransaction {
@Override
public void addOrUpdate(Resource resource) throws StrolchModelException {
DBC.PRE.assertNotNull("resource must not be null", resource);
if (hasResource(resource.getType(), resource.getId()))
if (hasResource(resource.getType(), resource.getId()) && !getObjectFilter()
.hasElement(Tags.RESOURCE, resource.getLocator()))
getObjectFilter().update(Tags.RESOURCE, resource.getLocator(), resource);
else
getObjectFilter().add(Tags.RESOURCE, resource.getLocator(), resource);
@ -959,7 +960,7 @@ public abstract class AbstractTransaction implements StrolchTransaction {
@Override
public void addOrUpdate(Order order) throws StrolchModelException {
DBC.PRE.assertNotNull("order must not be null", order);
if (hasOrder(order.getType(), order.getId()))
if (hasOrder(order.getType(), order.getId()) && !getObjectFilter().hasElement(Tags.ORDER, order.getLocator()))
getObjectFilter().update(Tags.ORDER, order.getLocator(), order);
else
getObjectFilter().add(Tags.ORDER, order.getLocator(), order);
@ -968,7 +969,8 @@ public abstract class AbstractTransaction implements StrolchTransaction {
@Override
public void addOrUpdate(Activity activity) throws StrolchModelException {
DBC.PRE.assertNotNull("activity must not be null", activity);
if (hasActivity(activity.getType(), activity.getId()))
if (hasActivity(activity.getType(), activity.getId()) && !getObjectFilter()
.hasElement(Tags.ACTIVITY, activity.getLocator()))
getObjectFilter().update(Tags.ACTIVITY, activity.getLocator(), activity);
else
getObjectFilter().add(Tags.ACTIVITY, activity.getLocator(), activity);