DRYD-853: Include instance id in ES index name.

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index 08466017174ee459904f8cfe79aa02cc0fac41b4..4c8af469421160d0170aadd32041e9856610037e 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -1560,16 +1560,13 @@ public class ServiceMain {
         return repoConfigDoc;
     }
 
-    private String getElasticsearchIndexName(Document repoConfigDoc, String repositoryName,
-               String cspaceInstanceId) {
-       String result = ConfigUtils.DEFAULT_ELASTICSEARCH_INDEX_NAME;
-
-       if (repositoryName.equalsIgnoreCase(ConfigUtils.DEFAULT_NUXEO_REPOSITORY_NAME) == false) {
-               return repositoryName;
-       }
+       private String getElasticsearchIndexName(Document repoConfigDoc, String repositoryName, String cspaceInstanceId) {
+               String repo = repositoryName.equalsIgnoreCase(ConfigUtils.DEFAULT_NUXEO_REPOSITORY_NAME)
+                       ? ConfigUtils.DEFAULT_ELASTICSEARCH_INDEX_NAME
+                       : repositoryName;
 
-       return result;
-    }
+               return repo + cspaceInstanceId;
+       }
 
     /*
      * This method is filling out the elasticsearch-config.xml file with tenant specific repository information.