1 files changed, 9 insertions, 4 deletions
diff --git a/java/newclient/src/main/java/org/apache/qpid/nclient/security/CallbackHandlerRegistry.java b/java/newclient/src/main/java/org/apache/qpid/nclient/security/CallbackHandlerRegistry.java
index 28ba2e355c..428cd6753d 100644
--- a/java/newclient/src/main/java/org/apache/qpid/nclient/security/CallbackHandlerRegistry.java
+++ b/java/newclient/src/main/java/org/apache/qpid/nclient/security/CallbackHandlerRegistry.java
@@ -62,11 +62,16 @@ public class CallbackHandlerRegistry
 
     private void parseProperties()
     {
-    	List<String> mechanisms = ClientConfiguration.get().getList(QpidConstants.AMQP_SECURITY_MECHANISMS);
-    	
-        for (String mechanism : mechanisms)
+	String key = QpidConstants.AMQP_SECURITY + "." + 
+        QpidConstants.AMQP_SECURITY_MECHANISMS + "." +
+        QpidConstants.AMQP_SECURITY_MECHANISM_HANDLER;
+        
+        int index = ClientConfiguration.get().getMaxIndex(key);                                       
+        	
+        for (int i=0; i<index+1;i++)
         {
-            String className = ClientConfiguration.get().getString(QpidConstants.AMQP_SECURITY_MECHANISM_HANDLER + "_" + mechanism);
+            String mechanism = ClientConfiguration.get().getString(key + "(" + i + ")[@type]");
+            String className = ClientConfiguration.get().getString(key + "(" + i + ")" );
             Class clazz = null;
             try
             {