You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ni...@apache.org on 2019/06/20 12:10:58 UTC

[activemq-artemis] branch master updated: ARTEMIS-2358 - fixing issue with last commit

This is an automated email from the ASF dual-hosted git repository.

nigrofranz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 61a563e  ARTEMIS-2358 - fixing issue with last commit
     new f6e7250  This closes #2719
61a563e is described below

commit 61a563ee95b79ffae5c15e465a4dd8d663fdd91c
Author: Andy <an...@gmail.com>
AuthorDate: Thu Jun 20 10:21:02 2019 +0100

    ARTEMIS-2358 - fixing issue with last commit
    
    https://issues.apache.org/jira/browse/ARTEMIS-2358
---
 .../activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
index e665a87..3bedc92 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
@@ -131,7 +131,7 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory {
             pagingFactoryFileFactory = new JDBCSequentialFileFactory(dbConf.getDataSource(), sqlProviderFactory.create(pageStoreTableNamePrefix, SQLProvider.DatabaseStoreType.PAGE), executorFactory.getExecutor(), criticalErrorListener);
          } else {
             String driverClassName = dbConf.getJdbcDriverClassName();
-            pagingFactoryFileFactory = new JDBCSequentialFileFactory(dbConf.getJdbcConnectionUrl(), null, null, driverClassName, JDBCUtils.getSQLProvider(driverClassName, pageStoreTableNamePrefix, SQLProvider.DatabaseStoreType.PAGE), executorFactory.getExecutor(), criticalErrorListener);
+            pagingFactoryFileFactory = new JDBCSequentialFileFactory(dbConf.getJdbcConnectionUrl(), dbConf.getJdbcUser(), dbConf.getJdbcPassword(), driverClassName, JDBCUtils.getSQLProvider(driverClassName, pageStoreTableNamePrefix, SQLProvider.DatabaseStoreType.PAGE), executorFactory.getExecutor(), criticalErrorListener);
          }
          final int jdbcNetworkTimeout = dbConf.getJdbcNetworkTimeout();
          if (jdbcNetworkTimeout >= 0) {