From eecaec47b677338306658cc473c5f9a58cc657ee Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Wed, 30 Jul 2014 08:19:53 +0000 Subject: 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 --- .../org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'qpid/java') 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 category = getCategory(configuredObjectClass); + if(category != null) + { + categories.add(category); + } } if (!"".equals(annotation.type())) { -- cgit v1.2.1