From 1ec575a2ffd071e23dfe661c4de5a47d7b310bf4 Mon Sep 17 00:00:00 2001 From: remillet Date: Thu, 30 Jun 2016 15:56:46 -0700 Subject: [PATCH] CSPACE-6972: Made tenant ID and tenant name optional in config for sync/replicate client. --- .../common/context/AbstractServiceContextImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java index aebe5ccec..f5c0c0d95 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java @@ -713,8 +713,16 @@ public abstract class AbstractServiceContextImpl properties.setProperty(AuthorityClient.PASSWORD_PROPERTY, remoteClientConfig.getPassword()); properties.setProperty(AuthorityClient.SSL_PROPERTY, remoteClientConfig.getSsl()); properties.setProperty(AuthorityClient.AUTH_PROPERTY, remoteClientConfig.getAuth()); - properties.setProperty(AuthorityClient.TENANT_ID_PROPERTY, remoteClientConfig.getTenantId()); - properties.setProperty(AuthorityClient.TENANT_NAME_PROPERTY, remoteClientConfig.getTenantName()); + // + // Optional values + String tenantId = remoteClientConfig.getTenantId(); + if (tenantId != null) { + properties.setProperty(AuthorityClient.TENANT_ID_PROPERTY, tenantId); + } + String tenantName = remoteClientConfig.getTenantName(); + if (tenantName != null) { + properties.setProperty(AuthorityClient.TENANT_NAME_PROPERTY, tenantName); + } result = getClient(properties); -- 2.47.3