Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 313F8200C1D for ; Thu, 16 Feb 2017 21:04:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2FC1E160B6F; Thu, 16 Feb 2017 20:04:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7AE4D160B52 for ; Thu, 16 Feb 2017 21:04:28 +0100 (CET) Received: (qmail 28902 invoked by uid 500); 16 Feb 2017 20:04:27 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 28892 invoked by uid 99); 16 Feb 2017 20:04:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2017 20:04:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95E68DFC63; Thu, 16 Feb 2017 20:04:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 16 Feb 2017 20:04:27 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-976: PostgresSequentialSequentialFileDriver SQLProvider NPE fix archived-at: Thu, 16 Feb 2017 20:04:29 -0000 Repository: activemq-artemis Updated Branches: refs/heads/master f900d8a97 -> bcecda73f ARTEMIS-976: PostgresSequentialSequentialFileDriver SQLProvider NPE fix Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fc70f941 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fc70f941 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fc70f941 Branch: refs/heads/master Commit: fc70f9414a7ead589216e8e2aee6e19ab223a5fd Parents: f900d8a Author: dOkI Authored: Fri Feb 17 00:35:49 2017 +0500 Committer: Clebert Suconic Committed: Thu Feb 16 15:00:42 2017 -0500 ---------------------------------------------------------------------- .../artemis/jdbc/store/file/JDBCFileUtils.java | 5 ++--- .../PostgresSequentialSequentialFileDriver.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fc70f941/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java ---------------------------------------------------------------------- diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java index b5f1aa6..1bfdd70 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java @@ -44,8 +44,7 @@ class JDBCFileUtils { static JDBCSequentialFileFactoryDriver getDBFileDriver(DataSource dataSource, SQLProvider provider) throws SQLException { JDBCSequentialFileFactoryDriver dbDriver; if (provider instanceof PostgresSQLProvider) { - dbDriver = new PostgresSequentialSequentialFileDriver(); - dbDriver.setDataSource(dataSource); + dbDriver = new PostgresSequentialSequentialFileDriver(dataSource, provider); } else { dbDriver = new JDBCSequentialFileFactoryDriver(dataSource, provider); } @@ -55,7 +54,7 @@ class JDBCFileUtils { static JDBCSequentialFileFactoryDriver getDBFileDriver(Connection connection, SQLProvider provider) throws SQLException { JDBCSequentialFileFactoryDriver dbDriver; if (provider instanceof PostgresSQLProvider) { - dbDriver = new PostgresSequentialSequentialFileDriver(); + dbDriver = new PostgresSequentialSequentialFileDriver(connection, provider); dbDriver.setConnection(connection); } else { dbDriver = new JDBCSequentialFileFactoryDriver(connection, provider); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fc70f941/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java ---------------------------------------------------------------------- diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java index cdc167f..85d4813 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java @@ -17,14 +17,18 @@ package org.apache.activemq.artemis.jdbc.store.file; import java.nio.ByteBuffer; +import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider; import org.postgresql.PGConnection; import org.postgresql.largeobject.LargeObject; import org.postgresql.largeobject.LargeObjectManager; +import javax.sql.DataSource; + @SuppressWarnings("SynchronizeOnNonFinalField") public final class PostgresSequentialSequentialFileDriver extends JDBCSequentialFileFactoryDriver { @@ -34,6 +38,18 @@ public final class PostgresSequentialSequentialFileDriver extends JDBCSequential super(); } + public PostgresSequentialSequentialFileDriver(DataSource dataSource, SQLProvider provider) { + super(); + this.setDataSource(dataSource); + this.setSqlProvider(provider); + } + + public PostgresSequentialSequentialFileDriver(Connection connection, SQLProvider provider) { + super(); + this.setConnection(connection); + this.setSqlProvider(provider); + } + @Override protected void prepareStatements() throws SQLException { this.deleteFile = connection.prepareStatement(sqlProvider.getDeleteFileSQL());