CSPACE-6972: Made tenant ID and tenant name optional in config for sync/replicate...

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 aebe5cceccf88dcabac2b5dee5586809148b5a75..f5c0c0d95cbcffc722840857d48b87e1d9d49986 100644 (file)
--- 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<IT, OT>
         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);