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

Fix Inheritance class

parent 2a6d4db2
Branches
Tags
1 merge request!21Release v0.4.0
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment