diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-07-29 12:58:37 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-07-29 12:58:37 +0000 |
| commit | 2db948b9045d5c13919db8db3bfeca3712203a56 (patch) | |
| tree | 69e9fdc687a976e60d3d3648dd4bf9825dc2ce2d /qpid/java/broker-plugins/jdbc-store/src/main | |
| parent | 14e411f0f8fbbd10aa8bf08e8926332265e04b1c (diff) | |
| download | qpid-python-2db948b9045d5c13919db8db3bfeca3712203a56.tar.gz | |
QPID-5937 : [Java Broker] Add parameters to REST servlet to allow return of actual vs. effective attribute values
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614333 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/jdbc-store/src/main')
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java index 9453c135e9..554caebf5f 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java @@ -114,7 +114,7 @@ public class GenericJDBCConfigurationStore extends AbstractJDBCConfigurationStor { Map<String, String> providerAttributes = new HashMap<>(); Set<String> providerAttributeNames = connectionProviderFactory.getProviderAttributeNames(); - providerAttributeNames.retainAll(parent.getContextKeys()); + providerAttributeNames.retainAll(parent.getContextKeys(false)); for(String attr : providerAttributeNames) { providerAttributes.put(attr, parent.getContextValue(String.class, attr)); diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java index 3304d01d86..338ef52078 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java @@ -93,7 +93,7 @@ public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore { Map<String, String> providerAttributes = new HashMap<>(); Set<String> providerAttributeNames = connectionProviderFactory.getProviderAttributeNames(); - providerAttributeNames.retainAll(parent.getContextKeys()); + providerAttributeNames.retainAll(parent.getContextKeys(false)); for(String attr : providerAttributeNames) { providerAttributes.put(attr, parent.getContextValue(String.class, attr)); diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java index 8cd4996033..eec2d49a80 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java @@ -224,7 +224,7 @@ public abstract class JDBCDetails public static JDBCDetails getDetailsForJdbcUrl(String jdbcUrl, final ConfiguredObject<?> object) { - final Set<String> contextKeys = object.getContextKeys(); + final Set<String> contextKeys = object.getContextKeys(false); Map<String,String> mapConversion = new AbstractMap<String, String>() { @Override |