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/plugin/QpidServiceLoader.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
index 51f2940913..9f94e7d09d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
@@ -57,7 +57,7 @@ public class QpidServiceLoader
while(serviceLoaderIterator.hasNext())
{
C next = serviceLoaderIterator.next();
- if(!isDisabled(next))
+ if(!isDisabled(clazz, next))
{
serviceImplementations.add(next);
}
@@ -76,9 +76,9 @@ public class QpidServiceLoader
return serviceImplementations;
}
- private <C extends Pluggable> boolean isDisabled(final C next)
+ private <C extends Pluggable> boolean isDisabled(Class<C> clazz, final C next)
{
- return Boolean.getBoolean("qpid.plugin.disabled:"+next.getClass().getName())
+ return Boolean.getBoolean("qpid.plugin.disabled:"+clazz.getSimpleName().toLowerCase()+"."+next.getType())
|| (next instanceof ConfiguredObjectTypeFactory && isDisabledConfiguredType((ConfiguredObjectTypeFactory<?>) next));
}