[airavata] branch develop updated: Some gateways won't have a GatewayGroups, so no admin groups to share experiment with

[ma...@apache.org]

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


The following commit(s) were added to refs/heads/develop by this push:
     new f463f1d  Some gateways won't have a GatewayGroups, so no admin groups to share experiment with
f463f1d is described below

commit f463f1de86e3bebb102aae9f37781d6343d687b8
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jul 19 14:32:44 2018 -0400

    Some gateways won't have a GatewayGroups, so no admin groups to share experiment with
---
 .../sharing/registry/migrator/airavata/AiravataDataMigrator.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
index 4a99cbc..2207e31 100644
--- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
+++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
@@ -262,7 +262,11 @@ public class AiravataDataMigrator {
         for (Entity entity : experimentEntities) {
             if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, entity.entityId))
                 sharingRegistryServerHandler.createEntity(entity);
-            shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.domainId), false);
+            if (gatewayGroupsMap.containsKey(entity.domainId)) {
+                shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, gatewayGroupsMap.get(entity.domainId), false);
+            } else {
+                System.out.println("Warning: no Admin gateway groups to share experiment entity " + entity.entityId + " in gateway " + entity.domainId);
+            }
         }
 
         //Creating application deployment entries