From 4eb85a560fd1257e0019fcd9a279c9bc2acd29cd Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 25 Feb 2021 14:05:24 +0100
Subject: [PATCH] fix merge conflicts
---
.../java/org/caosdb/server/jobs/core/InitEntityStateJobs.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/caosdb/server/jobs/core/InitEntityStateJobs.java b/src/main/java/org/caosdb/server/jobs/core/InitEntityStateJobs.java
index 3b8a6465..7dbff695 100644
--- a/src/main/java/org/caosdb/server/jobs/core/InitEntityStateJobs.java
+++ b/src/main/java/org/caosdb/server/jobs/core/InitEntityStateJobs.java
@@ -40,7 +40,6 @@ import org.caosdb.server.entity.WritableEntity;
import org.caosdb.server.entity.wrapper.Property;
import org.caosdb.server.jobs.JobAnnotation;
import org.caosdb.server.jobs.JobExecutionTime;
-import org.caosdb.server.transaction.Delete;
import org.caosdb.server.transaction.WriteTransaction;
import org.caosdb.server.utils.EntityStatus;
import org.caosdb.server.utils.Observable;
@@ -68,7 +67,7 @@ public class InitEntityStateJobs extends EntityStateJob implements Observer {
State newState = handleNewState();
State oldState = handleOldState(newState);
if (newState != null || oldState != null) {
- if (!(getTransaction() instanceof Delete)) {
+ if (!(getEntity() instanceof DeleteEntity)) {
appendJob(MakeStateProperty.class);
}
--
GitLab