CSPACE-6341: Updated the Report service to use an instance-qualified database name...

diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
index ecd7764db177ce38f39e43559ef5e2801eb0ed2a..0cbfb8b43cf402db148534fa21c4e3a95bff152d 100644 (file)
--- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
+++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
@@ -102,7 +102,7 @@ public class ReportDocumentModelHandler extends DocHandlerBase<ReportsCommon> {
     private static String REPORTS_STD_GROUPCSID_PARAM = "groupcsid";
     private static String REPORTS_STD_CSIDLIST_PARAM = "csidlist";
     private static String REPORTS_STD_TENANTID_PARAM = "tenantid";
-       
+    
        public InputStream invokeReport(
                        ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
                        String csid,
@@ -404,7 +404,9 @@ public class ReportDocumentModelHandler extends DocHandlerBase<ReportsCommon> {
        try {
                String repositoryName = ctx.getRepositoryName();
                if (repositoryName != null && repositoryName.trim().isEmpty() == false) {
-                       result = JDBCTools.getConnection(JDBCTools.NUXEO_DATASOURCE_NAME, repositoryName);
+                        String cspaceInstanceId = ServiceMain.getInstance().getCspaceInstanceId();
+                        String databaseName = JDBCTools.getDatabaseName(repositoryName, cspaceInstanceId);
+                       result = JDBCTools.getConnection(JDBCTools.NUXEO_DATASOURCE_NAME, databaseName);
                }
                } catch (Exception e) {
                        Log.error(e);