diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-10-16 16:03:44 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-10-16 16:03:44 +0000 |
| commit | 60b0ddc96469cc519ac64a4ef078878c2fd4d73a (patch) | |
| tree | 6cc185adf1eebd88bfe512f58b99413ef90baf60 /qpid/java | |
| parent | a0e45180fd81652187e2b6f2a04a74aaba371935 (diff) | |
| download | qpid-python-60b0ddc96469cc519ac64a4ef078878c2fd4d73a.tar.gz | |
QPID-6159 : [Java Broker] AbstractConfiguredObject.getContextKeys() should include default context
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1632369 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index e6f79fef16..b146854c7c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -1578,7 +1578,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im @Override public Set<String> getContextKeys(final boolean excludeSystem) { - Map<String,String> inheritedContext = new HashMap<>(); + Map<String,String> inheritedContext = new HashMap<>(_model.getTypeRegistry().getDefaultContext()); if(!excludeSystem) { inheritedContext.putAll(System.getenv()); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java index e377d31baf..ac980568b6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java @@ -854,6 +854,9 @@ public class ConfiguredObjectTypeRegistry return map != null ? Collections.unmodifiableMap(map) : Collections.<State, Map<State, Method>>emptyMap(); } - + public Map<String,String> getDefaultContext() + { + return Collections.unmodifiableMap(_defaultContext); + } } |