[airavata] branch develop updated: Handle any error when trying to load user's roles

[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 1adf1bd  Handle any error when trying to load user's roles
1adf1bd is described below

commit 1adf1bd5ad9727dd0f4739088d7a0c048cf7115c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jul 19 14:19:02 2018 -0400

    Handle any error when trying to load user's roles
---
 .../sharing/registry/migrator/airavata/AiravataDataMigrator.java       | 3 +--
 1 file changed, 1 insertion(+), 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 ab36c9e..4a99cbc 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
@@ -40,7 +40,6 @@ import org.apache.airavata.registry.api.RegistryService;
 import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.airavata.service.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl;
-import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException;
 import org.apache.airavata.sharing.registry.models.*;
 import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler;
 import org.apache.thrift.TException;
@@ -419,7 +418,7 @@ public class AiravataDataMigrator {
                 } else {
                     System.err.println("Warning: user [" + username + "] in tenant [" + gatewayId + "] has no roles.");
                 }
-            } catch (IamAdminServicesException e) {
+            } catch (Exception e) {
                 System.err.println("Error: unable to load roles for user [" + username + "] in tenant [" + gatewayId + "].");
                 e.printStackTrace();
             }