You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/07/30 10:19:54 UTC
svn commit: r1614581 -
/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
Author: rgodfrey
Date: Wed Jul 30 08:19:53 2014
New Revision: 1614581
URL: http://svn.apache.org/r1614581
Log:
QPID-5940 : [Java Broker] Fix type registry to work when run in tests
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java?rev=1614581&r1=1614580&r2=1614581&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java Wed Jul 30 08:19:53 2014
@@ -101,7 +101,11 @@ public class ConfiguredObjectTypeRegistr
}
else
{
- categories.add(getCategory(configuredObjectClass));
+ Class<? extends ConfiguredObject> category = getCategory(configuredObjectClass);
+ if(category != null)
+ {
+ categories.add(category);
+ }
}
if (!"".equals(annotation.type()))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org