You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/08/31 21:07:00 UTC
[airavata] 01/02: AIRAVATA-3508 Null check when checking if compute
resource is enabled
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit b064dcaf3482befa8394ab70534714c24304e8d0
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Aug 31 17:06:14 2021 -0400
AIRAVATA-3508 Null check when checking if compute resource is enabled
---
.../apache/airavata/api/server/handler/AiravataServerHandler.java | 3 ++-
.../registry/api/service/handler/RegistryServerHandler.java | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index a5e1894..1d3b04c 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -2160,7 +2160,8 @@ public class AiravataServerHandler implements Airavata.Iface {
existingExperiment.unsetProcesses();
existingExperiment.unsetExperimentStatus();
if(existingExperiment.getUserConfigurationData() != null && existingExperiment.getUserConfigurationData()
- .getComputationalResourceScheduling() != null){
+ .getComputationalResourceScheduling() != null
+ && existingExperiment.getUserConfigurationData().getComputationalResourceScheduling().getResourceHostId() != null){
String compResourceId = existingExperiment.getUserConfigurationData()
.getComputationalResourceScheduling().getResourceHostId();
diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
index 3ff767d..b91a139 100644
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@ -3645,7 +3645,8 @@ public class RegistryServerHandler implements RegistryService.Iface {
switch (experimentState){
case CREATED: case VALIDATED:
if(experiment.getUserConfigurationData() != null && experiment.getUserConfigurationData()
- .getComputationalResourceScheduling() != null){
+ .getComputationalResourceScheduling() != null
+ && experiment.getUserConfigurationData().getComputationalResourceScheduling().getResourceHostId() != null){
String compResourceId = experiment.getUserConfigurationData()
.getComputationalResourceScheduling().getResourceHostId();
ComputeResourceDescription computeResourceDescription = new ComputeResourceRepository()
@@ -3747,7 +3748,8 @@ public class RegistryServerHandler implements RegistryService.Iface {
}
if(experiment.getUserConfigurationData() != null && experiment.getUserConfigurationData()
- .getComputationalResourceScheduling() != null){
+ .getComputationalResourceScheduling() != null
+ && experiment.getUserConfigurationData().getComputationalResourceScheduling().getResourceHostId() != null){
String compResourceId = experiment.getUserConfigurationData()
.getComputationalResourceScheduling().getResourceHostId();