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 08244200D1E for ; Wed, 18 Oct 2017 14:49:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 068E1160BEA; Wed, 18 Oct 2017 12:49:14 +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 4CAAA1609EE for ; Wed, 18 Oct 2017 14:49:13 +0200 (CEST) Received: (qmail 63585 invoked by uid 500); 18 Oct 2017 12:49:12 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 63576 invoked by uid 99); 18 Oct 2017 12:49:12 -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; Wed, 18 Oct 2017 12:49:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6119EDF9FD; Wed, 18 Oct 2017 12:49:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rgodfrey@apache.org To: commits@qpid.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: qpid-broker-j git commit: QPID-7973: Table Name Prefix is set to NULL if no prefix is provided instead of empty String This closes #2 Date: Wed, 18 Oct 2017 12:49:12 +0000 (UTC) archived-at: Wed, 18 Oct 2017 12:49:14 -0000 Repository: qpid-broker-j Updated Branches: refs/heads/master 4cfa7c30f -> d68c89705 QPID-7973: Table Name Prefix is set to NULL if no prefix is provided instead of empty String This closes #2 Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/d68c8970 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d68c8970 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d68c8970 Branch: refs/heads/master Commit: d68c897052ca3e7a07f7ca4fccfd1f4d6832b6d7 Parents: 4cfa7c3 Author: aboutros Authored: Wed Oct 18 12:34:14 2017 +0200 Committer: rgodfrey Committed: Wed Oct 18 14:48:47 2017 +0200 ---------------------------------------------------------------------- .../qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java | 2 +- .../apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d68c8970/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java ---------------------------------------------------------------------- diff --git a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java index 4f82077..e10935a 100644 --- a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java +++ b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java @@ -70,7 +70,7 @@ public abstract class AbstractJDBCConfigurationStore implements MessageStoreProv protected void setTableNamePrefix(final String tableNamePrefix) { - _tableNamePrefix = tableNamePrefix; + _tableNamePrefix = tableNamePrefix == null ? "" : tableNamePrefix; } @Override http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d68c8970/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java ---------------------------------------------------------------------- diff --git a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java index a30451d..099029c 100644 --- a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java +++ b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java @@ -708,7 +708,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore protected void setTablePrefix(final String tablePrefix) { - _tablePrefix = tablePrefix; + _tablePrefix = tablePrefix == null ? "" : tablePrefix; } private String getDbVersionTableName() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org