CSPACE-4192 - Ensure tenant ID values are unique at startup.

diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
index 1cd35ed8032722d0d837229ca1fb0e62d2c3fc7f..dfbb4fe1fc3850289b7d4ba0b09ac10b069130de 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
@@ -177,6 +177,14 @@ public class TenantBindingConfigReaderImpl
         tenantBindingTypeList = readTenantConfigs(protoBindingsFile, tenantDirs);
         
         for (TenantBindingType tenantBinding : tenantBindingTypeList) {
+               if(tenantBindings.get(tenantBinding.getId()) != null) {
+                       TenantBindingType tenantBindingOld = tenantBindings.get(tenantBinding.getId());
+                logger.error("Ignoring duplicate binding definition for tenant id=" 
+                               + tenantBinding.getId()
+                        + " existing name=" + tenantBindingOld.getName()
+                        + " conflicting (ignored) name=" + tenantBinding.getName());
+                continue;
+               }
             tenantBindings.put(tenantBinding.getId(), tenantBinding);
             readDomains(tenantBinding);
             readServiceBindings(tenantBinding);