Skip to content
Snippets Groups Projects
Verified Commit 4eb85a56 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

fix merge conflicts

parent a8152aab
Branches
Tags
3 merge requests!21Release v0.4.0,!7F fsm,!6Draft: F acm permissions2
...@@ -40,7 +40,6 @@ import org.caosdb.server.entity.WritableEntity; ...@@ -40,7 +40,6 @@ import org.caosdb.server.entity.WritableEntity;
import org.caosdb.server.entity.wrapper.Property; import org.caosdb.server.entity.wrapper.Property;
import org.caosdb.server.jobs.JobAnnotation; import org.caosdb.server.jobs.JobAnnotation;
import org.caosdb.server.jobs.JobExecutionTime; import org.caosdb.server.jobs.JobExecutionTime;
import org.caosdb.server.transaction.Delete;
import org.caosdb.server.transaction.WriteTransaction; import org.caosdb.server.transaction.WriteTransaction;
import org.caosdb.server.utils.EntityStatus; import org.caosdb.server.utils.EntityStatus;
import org.caosdb.server.utils.Observable; import org.caosdb.server.utils.Observable;
...@@ -68,7 +67,7 @@ public class InitEntityStateJobs extends EntityStateJob implements Observer { ...@@ -68,7 +67,7 @@ public class InitEntityStateJobs extends EntityStateJob implements Observer {
State newState = handleNewState(); State newState = handleNewState();
State oldState = handleOldState(newState); State oldState = handleOldState(newState);
if (newState != null || oldState != null) { if (newState != null || oldState != null) {
if (!(getTransaction() instanceof Delete)) { if (!(getEntity() instanceof DeleteEntity)) {
appendJob(MakeStateProperty.class); appendJob(MakeStateProperty.class);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment