summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java6
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()))
{