You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/06/23 02:39:06 UTC
[airavata-custos] branch develop updated: Bug fix in tenant mapper
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new cee8901 Bug fix in tenant mapper
new a48e2e0 Merge pull request #215 from isururanawaka/sdk_update
cee8901 is described below
commit cee890160f586cf477417d4a527566ed41eea8ee
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Jun 22 22:37:45 2021 -0400
Bug fix in tenant mapper
---
.../java/org/apache/custos/tenant/profile/mapper/TenantMapper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java b/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java
index 5ab26af..a3b541c 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java
+++ b/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java
@@ -53,7 +53,7 @@ public class TenantMapper {
tenantEntity.setAdminLastName(tenant.getAdminLastName());
tenantEntity.setAdminEmail(tenant.getAdminEmail());
tenantEntity.setRequesterEmail(tenant.getRequesterEmail());
- tenantEntity.setLogoURI(tenant.getClientUri());
+ tenantEntity.setLogoURI(tenant.getLogoUri());
tenantEntity.setScope(tenant.getScope());
tenantEntity.setDomain(tenant.getDomain());
tenantEntity.setAdminUsername(tenant.getAdminUsername());
@@ -132,7 +132,7 @@ public class TenantMapper {
.setAdminFirstName(tenantEntity.getAdminFirstName())
.setAdminLastName(tenantEntity.getAdminLastName())
.setDomain(tenantEntity.getDomain())
- .setClientUri(tenantEntity.getLogoURI())
+ .setClientUri(tenantEntity.getUri()==null?tenantEntity.getLogoURI():tenantEntity.getUri())
.setRequesterEmail(tenantEntity.getRequesterEmail())
.setScope(tenantEntity.getScope())
.addAllContacts(contactList)