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/bdbstore/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/bdbstore/src/main')
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java index 4c3b72a29b..6d3238728e 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactory.java @@ -71,7 +71,7 @@ public class StandardEnvironmentFacadeFactory implements EnvironmentFacadeFactor for (ConfigParam cp : EnvironmentParams.SUPPORTED_PARAMS.values()) { final String parameterName = cp.getName(); - Set<String> contextKeys = parent.getContextKeys(); + Set<String> contextKeys = parent.getContextKeys(false); if (!cp.isForReplication() && contextKeys.contains(parameterName)) { envConfigMap.put(parameterName, parent.getContextValue(String.class, parameterName)); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java index 37d53319b5..109bfe6978 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeFactory.java @@ -126,7 +126,7 @@ public class ReplicatedEnvironmentFacadeFactory implements EnvironmentFacadeFact private Map<String, String> buildConfig(ConfiguredObject<?> parent, Pattern paramName) { Map<String, String> targetMap = new HashMap<>(); - for (String name : parent.getContextKeys()) + for (String name : parent.getContextKeys(false)) { if (paramName.matcher(name).matches()) { diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java index 061fa12768..2cdb6ec635 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java @@ -418,7 +418,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu LOGGER.debug("Creating new virtualhost with name : " + getGroupName()); } - boolean hasBlueprint = getContextKeys().contains(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR); + boolean hasBlueprint = getContextKeys(false).contains(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR); boolean blueprintUtilised = getContext().containsKey(VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR) && Boolean.parseBoolean(String.valueOf(getContext().get( VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR))); |