no message
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/4ed7692a Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/4ed7692a Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/4ed7692a Branch: refs/heads/develop Commit: 4ed7692a00909c5b5cf8dc6838659aebe2b7eb42 Parents: e97719d Author: unknown <[email protected]> Authored: Wed Feb 17 12:32:19 2016 +0530 Committer: unknown <[email protected]> Committed: Wed Feb 17 12:32:19 2016 +0530 ---------------------------------------------------------------------- .../report/service/PentahoReportingProcessServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/4ed7692a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java ---------------------------------------------------------------------- diff --git a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java index 3a8f80a..36af4aa 100644 --- a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java +++ b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java @@ -19,6 +19,7 @@ import javax.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; import org.apache.fineract.infrastructure.core.api.ApiParameterHelper; +import org.apache.fineract.infrastructure.core.boot.JDBCDriverConfig; import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant; import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenantConnection; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; @@ -56,6 +57,8 @@ public class PentahoReportingProcessServiceImpl implements ReportingProcessServi private final PlatformSecurityContext context; private boolean noPentaho = false; + @Autowired private JDBCDriverConfig driverConfig ; + @Autowired public PentahoReportingProcessServiceImpl(final PlatformSecurityContext context) { // kick off pentaho reports server @@ -187,8 +190,7 @@ public class PentahoReportingProcessServiceImpl implements ReportingProcessServi // data scoping final FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant(); final FineractPlatformTenantConnection tenantConnection = tenant.getConnection(); - - final String tenantUrl = tenantConnection.databaseURL(); + String tenantUrl = driverConfig.constructProtocol(tenantConnection.getSchemaServer(), tenantConnection.getSchemaServerPort(), tenantConnection.getSchemaName()) ; final String userhierarchy = currentUser.getOffice().getHierarchy(); logger.info("db URL:" + tenantUrl + " userhierarchy:" + userhierarchy); rptParamValues.put("userhierarchy", userhierarchy);
