1 files changed, 18 insertions, 11 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
index 8c62441d59..30d506a89b 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
@@ -21,12 +21,13 @@
 package org.apache.qpid.server.protocol;
 
 import org.apache.qpid.protocol.ProtocolEngine;
+import org.apache.qpid.transport.NetworkDriver;
 import org.apache.qpid.transport.network.InputHandler;
 import org.apache.qpid.transport.network.Assembler;
 import org.apache.qpid.transport.network.Disassembler;
-import org.apache.qpid.transport.network.NetworkConnection;
 import org.apache.qpid.server.configuration.*;
 import org.apache.qpid.server.transport.ServerConnection;
+import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 
@@ -37,7 +38,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
 {
     public static final int MAX_FRAME_SIZE = 64 * 1024 - 1;
 
-    private NetworkConnection _network;
+    private NetworkDriver _networkDriver;
     private long _readBytes;
     private long _writtenBytes;
     private ServerConnection _connection;
@@ -46,17 +47,26 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
     private long _createTime = System.currentTimeMillis();
 
     public ProtocolEngine_0_10(ServerConnection conn,
-                               NetworkConnection network,
+                               NetworkDriver networkDriver,
                                final IApplicationRegistry appRegistry)
     {
         super(new Assembler(conn));
         _connection = conn;
         _connection.setConnectionConfig(this);
-        _network = network;
+        _networkDriver = networkDriver;
         _id = appRegistry.getConfigStore().createId();
         _appRegistry = appRegistry;
 
-        _connection.setSender(new Disassembler(_network.getSender(), MAX_FRAME_SIZE));
+        // FIXME Two log messages to maintain compatinbility with earlier protocol versions
+        _connection.getLogActor().message(ConnectionMessages.OPEN(null, null, false, false));
+        _connection.getLogActor().message(ConnectionMessages.OPEN(null, "0-10", false, true));
+    }
+
+    public void setNetworkDriver(NetworkDriver driver)
+    {
+        _networkDriver = driver;
+        Disassembler dis = new Disassembler(driver, MAX_FRAME_SIZE);
+        _connection.setSender(dis);
         _connection.onOpen(new Runnable()
         {
             public void run()
@@ -65,19 +75,16 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
             }
         });
 
-        // FIXME Two log messages to maintain compatibility with earlier protocol versions
-        _connection.getLogActor().message(ConnectionMessages.OPEN(null, null, false, false));
-        _connection.getLogActor().message(ConnectionMessages.OPEN(null, "0-10", false, true));
     }
 
     public SocketAddress getRemoteAddress()
     {
-        return _network.getRemoteAddress();
+        return _networkDriver.getRemoteAddress();
     }
 
     public SocketAddress getLocalAddress()
     {
-        return _network.getLocalAddress();
+        return _networkDriver.getLocalAddress();
     }
 
     public long getReadBytes()
@@ -127,7 +134,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
 
     public String getAuthId()
     {
-        return _connection.getAuthorizedPrincipal() == null ? null : _connection.getAuthorizedPrincipal().getName();
+        return _connection.getAuthorizationID();
     }
 
     public String getRemoteProcessName()