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

FIX buggy job loading during queries

parent 6eb95628
No related branches found
No related tags found
3 merge requests!21Release v0.4.0,!7F fsm,!6Draft: F acm permissions2
......@@ -22,6 +22,7 @@
*/
package org.caosdb.server.jobs.core;
import org.caosdb.server.entity.EntityInterface;
import org.caosdb.server.entity.Message;
import org.caosdb.server.jobs.FlagJob;
import org.caosdb.server.jobs.JobAnnotation;
......@@ -51,5 +52,8 @@ public class ExecuteQuery extends FlagJob {
getContainer().addMessage(new Message(e.getMessage()));
}
getContainer().addMessage(queryInstance);
for (EntityInterface entity : getContainer()) {
getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));
}
}
}
......@@ -23,6 +23,7 @@
package org.caosdb.server.jobs.core;
import org.caosdb.server.database.backend.transaction.RetrieveAll;
import org.caosdb.server.entity.EntityInterface;
import org.caosdb.server.jobs.FlagJob;
import org.caosdb.server.jobs.JobAnnotation;
import org.caosdb.server.jobs.JobExecutionTime;
......@@ -37,6 +38,9 @@ public class RetrieveAllJob extends FlagJob {
value = "ENTITY";
}
execute(new RetrieveAll(getContainer(), value));
for (EntityInterface entity : getContainer()) {
getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));
}
}
}
}
......@@ -105,17 +105,7 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
// additionally load datatype job
if (e.hasValue()) {
boolean found = false;
for (final Job j : loadJobs) {
if (CheckDatatypePresent.class.isInstance(j)
&& ((CheckDatatypePresent) j).getEntity() == e) {
found = true;
}
}
if (!found) {
this.schedule.add(new CheckDatatypePresent().init(Mode.MUST, e, this));
}
this.schedule.add(new CheckDatatypePresent().init(Mode.MUST, e, this));
}
// load pickup job if necessary
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment