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 <about...@murex.com> Authored: Wed Oct 18 12:34:14 2017 +0200 Committer: rgodfrey <rgodf...@apache.org> 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-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org