1 files changed, 35 insertions, 5 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
index 2833565afc..8caf29ecb5 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
@@ -52,13 +52,28 @@ public class ServerDelegate extends ConnectionDelegate
 {
 
     private SaslServer saslServer;
+    private List<Object> _locales;
+    private List<Object> _mechanisms;
+    private Map<String, Object> _clientProperties;
+
+
+    public ServerDelegate()
+    {
+        this(null, Collections.EMPTY_LIST, Collections.singletonList((Object)"utf8"));
+    }
+
+    protected ServerDelegate(Map<String, Object> clientProperties, List<Object> mechanisms, List<Object> locales)
+    {
+        _clientProperties = clientProperties;
+        _mechanisms = mechanisms;
+        _locales = locales;
+    }
 
     public void init(Connection conn, ProtocolHeader hdr)
     {
         conn.send(new ProtocolHeader(1, 0, 10));
-        List<Object> utf8 = new ArrayList<Object>();
-        utf8.add("utf8");
-        conn.connectionStart(null, Collections.EMPTY_LIST, utf8);
+
+        conn.connectionStart(_clientProperties, _mechanisms, _locales);
     }
 
     @Override public void connectionStartOk(Connection conn, ConnectionStartOk ok)
@@ -77,8 +92,8 @@ public class ServerDelegate extends ConnectionDelegate
 
         try
         {
-            SaslServer ss = Sasl.createSaslServer
-                (mechanism, "AMQP", "localhost", null, null);
+            
+            SaslServer ss = createSaslServer(mechanism);
             if (ss == null)
             {
                 conn.connectionClose
@@ -95,6 +110,14 @@ public class ServerDelegate extends ConnectionDelegate
         }
     }
 
+    protected SaslServer createSaslServer(String mechanism)
+            throws SaslException
+    {
+        SaslServer ss = Sasl.createSaslServer
+            (mechanism, "AMQP", "localhost", null, null);
+        return ss;
+    }
+
     private void secure(Connection conn, byte[] response)
     {
         SaslServer ss = conn.getSaslServer();
@@ -133,9 +156,16 @@ public class ServerDelegate extends ConnectionDelegate
     @Override public void connectionOpen(Connection conn, ConnectionOpen open)
     {
         conn.connectionOpenOk(Collections.EMPTY_LIST);
+
         conn.setState(OPEN);
     }
 
+    protected Session getSession(Connection conn, SessionDelegate delegate, SessionAttach atc)
+    {
+        return new Session(conn, delegate, new Binary(atc.getName()), 0);
+    }
+
+
     public Session getSession(Connection conn, SessionAttach atc)
     {
         return new Session(conn, new Binary(atc.getName()), 0);