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

[Fix] Fixed not committing after archiving activity

This commit is contained in:
Robert von Burg 2017-09-19 15:19:29 +02:00
parent c11f01afeb
commit 80a1e4af62
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
View File

@ -287,6 +287,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
ActivityArchivalPolicy archivalPolicy = policyHandler.getPolicy(policyDef, tx);
archivalPolicy.archive(activity);
tx.commitOnClose();
}
});
} catch (Exception e) {

7
li.strolch.service/src/main/java/li/strolch/execution/policy/RemoveActivityArchival.java
View File

@ -2,7 +2,6 @@ package li.strolch.execution.policy;
import li.strolch.agent.api.ComponentContainer;
import li.strolch.model.activity.Activity;
import li.strolch.persistence.api.RemoveActivityCommand;
import li.strolch.persistence.api.StrolchTransaction;
public class RemoveActivityArchival extends ActivityArchivalPolicy {
@ -17,10 +16,8 @@ public class RemoveActivityArchival extends ActivityArchivalPolicy {
if (!activity.getState().isExecuted())
throw new IllegalStateException("Can not archive non-executed " + activity.getLocator());
RemoveActivityCommand cmd = new RemoveActivityCommand(getContainer(), tx());
cmd.setActivity(activity);
cmd.doCommand();
tx().removeActivity(activity);
logger.info("Removed " + activity.getLocator());
logger.info("Removing " + activity.getLocator());
}
}