From 8f60f5a0f316c9855651a19658242abf5ef73a42 Mon Sep 17 00:00:00 2001 From: "fabio.sinibaldi" Date: Tue, 11 Jun 2019 12:13:19 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-publishing/gCat-Feeder-Suite@179776 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../service/engine/impl/ExecutionManagerImpl.java | 6 +++++- .../gCatFeeder/service/engine/impl/ExecutionTask.java | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionManagerImpl.java b/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionManagerImpl.java index 874cc63..3b708e6 100644 --- a/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionManagerImpl.java +++ b/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionManagerImpl.java @@ -7,6 +7,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.PostConstruct; import javax.inject.Inject; +import org.gcube.data.publishing.gCatFeeder.model.EnvironmentConfiguration; import org.gcube.data.publishing.gCatFeeder.service.engine.CatalogueControllersManager; import org.gcube.data.publishing.gCatFeeder.service.engine.CollectorsManager; import org.gcube.data.publishing.gCatFeeder.service.engine.ExecutionManager; @@ -36,7 +37,8 @@ public class ExecutionManagerImpl implements ExecutionManager { private Storage storage; @Inject private LocalConfiguration config; - + @Inject + private EnvironmentConfiguration environmentConfig; @PostConstruct private void post() { @@ -79,6 +81,8 @@ public class ExecutionManagerImpl implements ExecutionManager { toSubmit.setInfastructureInterface(infrastructure); toSubmit.setPersistence(persistence); toSubmit.setStorage(storage); + toSubmit.setEnvironmentConfiguration(environmentConfig); + if(!executor.getQueue().contains(toSubmit)) { log.trace("Inserting execution in queue {} "); diff --git a/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionTask.java b/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionTask.java index 208c5a5..e524813 100644 --- a/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionTask.java +++ b/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/ExecutionTask.java @@ -57,8 +57,7 @@ public class ExecutionTask implements Runnable { public ExecutionTask(ExecutionDescriptor desc) { super(); - this.request=desc; - environmentConfiguration=new LiveEnvironmentConfiguration(); + this.request=desc; }