Repository: airavata Updated Branches: refs/heads/master 43c0ac50a -> 5b4cfc9e7
jpa issues Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5b4cfc9e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5b4cfc9e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5b4cfc9e Branch: refs/heads/master Commit: 5b4cfc9e7108d17db1f0b34c5d0ee9da52faf3f2 Parents: 43c0ac5 Author: Chathuri Wimalasena <[email protected]> Authored: Wed Sep 30 11:09:54 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Sep 30 11:09:54 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 6 ++++-- .../core/experiment/catalog/impl/ExperimentRegistry.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5b4cfc9e/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java index 3275734..571293a 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java @@ -46,6 +46,7 @@ import org.apache.airavata.model.process.ProcessModel; import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel; import org.apache.airavata.model.status.*; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.core.experiment.catalog.model.ProcessOutput; import org.apache.airavata.registry.cpi.*; import org.apache.commons.io.FileUtils; import org.apache.curator.framework.CuratorFramework; @@ -1095,8 +1096,7 @@ public class GFacUtils { try { ExperimentCatalog experimentCatalog = processContext.getExperimentCatalog(); String processId = processContext.getProcessId(); - ProcessModel processModel = (ProcessModel)experimentCatalog.get(ExperimentCatalogModelType.PROCESS, processId); - List<OutputDataObjectType> processOutputs = processModel.getProcessOutputs(); + List<OutputDataObjectType> processOutputs = (List<OutputDataObjectType> )experimentCatalog.get(ExperimentCatalogModelType.PROCESS_OUTPUT, processId); if (processOutputs != null && !processOutputs.isEmpty()){ for (OutputDataObjectType processOutput : processOutputs){ if (processOutput.getName().equals(outputName)){ @@ -1104,6 +1104,8 @@ public class GFacUtils { } } } + ProcessModel processModel = processContext.getProcessModel(); + processModel.setProcessOutputs(processOutputs); experimentCatalog.update(ExperimentCatalogModelType.PROCESS, processModel, processId); } catch (RegistryException e) { String msg = "expId: " + processContext.getExperimentId() + " processId: " + processContext.getProcessId() http://git-wip-us.apache.org/repos/asf/airavata/blob/5b4cfc9e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java index d960986..e718583 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java @@ -1038,7 +1038,7 @@ public class ExperimentRegistry { } else if (fieldName.equals(Constants.FieldConstants.ProcessConstants.PROCESS_INPUTS)) { return ThriftDataModelConversion.getProcessInputs(resource.getProcessInputs()); } else if (fieldName.equals(Constants.FieldConstants.ProcessConstants.PROCESS_OUTPUTS)) { - return ThriftDataModelConversion.getErrorModel(resource.getProcessOutputs()); + return ThriftDataModelConversion.getProcessOutputs(resource.getProcessOutputs()); } else if (fieldName.equals(Constants.FieldConstants.ProcessConstants.PROCESS_RESOURCE_SCHEDULE)) { return ThriftDataModelConversion.getProcessResourceSchedule(resource.getProcessResourceSchedule()); } else {
