QPID-6011 : [Java Broker] change plugin exclude naming mechanism to be more user-friendly

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618533 13f79535-47bb-0310-9956-ffa450edef68

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));
     }