diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-07-30 08:19:53 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-07-30 08:19:53 +0000 |
| commit | eecaec47b677338306658cc473c5f9a58cc657ee (patch) | |
| tree | 2bbbd6921e1be340beda2c72d08e6104ba6c46f3 | |
| parent | c6e3b231d55310521ce4b1877e925732f95b0df1 (diff) | |
| download | qpid-python-eecaec47b677338306658cc473c5f9a58cc657ee.tar.gz | |
QPID-5940 : [Java Broker] Fix type registry to work when run in tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614581 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 d692e663df..66ae7b2d2e 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 @@ -101,7 +101,11 @@ public class ConfiguredObjectTypeRegistry } else { - categories.add(getCategory(configuredObjectClass)); + Class<? extends ConfiguredObject> category = getCategory(configuredObjectClass); + if(category != null) + { + categories.add(category); + } } if (!"".equals(annotation.type())) { |