1 files changed, 1 insertions, 8 deletions
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
index 1815bea152..99ee7e2587 100644
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
@@ -103,14 +103,7 @@ namespace Qpid.Client.Handler
 
        private string ChooseMechanism(string mechanisms)
        {
-           foreach ( string mech in mechanisms.Split(' ') )
-           {
-               if ( CallbackHandlerRegistry.Instance.IsSupportedMechanism(mech) )
-               {
-                   return mech;
-               }
-           }
-           return null;
+          return CallbackHandlerRegistry.Instance.ChooseMechanism(mechanisms);
        }
 
        private byte[] DoAuthentication(string selectedMechanism, AMQProtocolSession ps)