From 9b514a832713465cbf7e8feba6db31b56c7e3adb Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 22 Jan 2021 16:18:07 +0100
Subject: [PATCH] Fix Inheritance class
---
.../org/caosdb/server/jobs/core/Inheritance.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/caosdb/server/jobs/core/Inheritance.java b/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
index 086787e8..d49bec09 100644
--- a/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
+++ b/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
@@ -24,16 +24,16 @@ package org.caosdb.server.jobs.core;
import java.util.ArrayList;
import java.util.List;
-import org.caosdb.server.database.backend.transaction.RetrieveFullEntity;
+import org.caosdb.server.database.backend.transaction.RetrieveFullEntityTransaction;
import org.caosdb.server.entity.Entity;
import org.caosdb.server.entity.EntityInterface;
+import org.caosdb.server.entity.InsertEntity;
import org.caosdb.server.entity.Message;
import org.caosdb.server.entity.Message.MessageType;
import org.caosdb.server.entity.StatementStatus;
+import org.caosdb.server.entity.UpdateEntity;
import org.caosdb.server.entity.wrapper.Property;
import org.caosdb.server.jobs.EntityJob;
-import org.caosdb.server.transaction.Insert;
-import org.caosdb.server.transaction.Update;
import org.caosdb.server.utils.EntityStatus;
/**
@@ -63,7 +63,7 @@ public class Inheritance extends EntityJob {
@Override
protected void run() {
- if (getTransaction() instanceof Insert || getTransaction() instanceof Update) {
+ if (getEntity() instanceof InsertEntity || getEntity() instanceof UpdateEntity) {
if (getEntity().hasParents()) {
final ArrayList<EntityInterface> transfer = new ArrayList<EntityInterface>();
parentLoop:
@@ -87,7 +87,7 @@ public class Inheritance extends EntityJob {
EntityInterface foreign = getEntityByName(parent.getName());
if (foreign == null) {
// was not in container -> retrieve from database.
- execute(new RetrieveFullEntity(parent));
+ execute(new RetrieveFullEntityTransaction(parent));
foreign = parent;
}
@@ -144,7 +144,7 @@ public class Inheritance extends EntityJob {
}
}
} else {
- execute(new RetrieveFullEntity(validProperty));
+ execute(new RetrieveFullEntityTransaction(validProperty));
}
if (validProperty.getEntityStatus() == EntityStatus.VALID) {
collectInheritedProperties(transfer, validProperty, inheritance);
--
GitLab