[airavata] branch develop updated: Sometimes project doesn't exist (bad data)

[machristie]

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 15ab2ea  Sometimes project doesn't exist (bad data)
15ab2ea is described below

commit 15ab2eaa34a5757ffa9228e7015631a5a0cdc127
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Thu Jul 19 14:51:53 2018 -0400

    Sometimes project doesn't exist (bad data)
---
 .../sharing/registry/migrator/airavata/AiravataDataMigrator.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 48c10bc..f869220 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
@@ -271,8 +271,13 @@ public class AiravataDataMigrator {
         }
 
         for (Entity entity : experimentEntities) {
-            if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, 
entity.entityId))
-                sharingRegistryServerHandler.createEntity(entity);
+            if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, 
entity.entityId)) {
+                if 
(!sharingRegistryServerHandler.isEntityExists(entity.domainId, 
entity.parentEntityId)) {
+                    System.out.println("Warning: project entity does exist for 
experiment entity " + entity.entityId + " in gateway " + entity.domainId);
+                } else {
+                    sharingRegistryServerHandler.createEntity(entity);
+                }
+            }
             if (gatewayGroupsMap.containsKey(entity.domainId)) {
                 
shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, 
gatewayGroupsMap.get(entity.domainId), false);
             } else {