1 files changed, 20 insertions, 60 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 1fe4ec792e..92b0236b6c 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
@@ -20,53 +20,42 @@
  */
 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.server.configuration.*;
-import org.apache.qpid.server.transport.ServerConnection;
+import java.util.UUID;
+
+import org.apache.qpid.server.configuration.ConfigStore;
+import org.apache.qpid.server.configuration.ConfiguredObject;
+import org.apache.qpid.server.configuration.ConnectionConfig;
+import org.apache.qpid.server.configuration.ConnectionConfigType;
+import org.apache.qpid.server.configuration.VirtualHostConfig;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
 import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.server.transport.ServerConnection;
+import org.apache.qpid.transport.network.Assembler;
+import org.apache.qpid.transport.network.Disassembler;
+import org.apache.qpid.transport.network.InputHandler;
+import org.apache.qpid.transport.network.NetworkConnection;
 
-import java.net.SocketAddress;
-import java.util.UUID;
-
-public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine, ConnectionConfig
+public class ProtocolEngine_0_10  extends InputHandler implements ConnectionConfig
 {
     public static final int MAX_FRAME_SIZE = 64 * 1024 - 1;
 
-    private NetworkDriver _networkDriver;
-    private long _readBytes;
-    private long _writtenBytes;
+    private NetworkConnection _network;
     private ServerConnection _connection;
     private final UUID _id;
     private final IApplicationRegistry _appRegistry;
     private long _createTime = System.currentTimeMillis();
 
-    public ProtocolEngine_0_10(ServerConnection conn,
-                               NetworkDriver networkDriver,
-                               final IApplicationRegistry appRegistry)
+    public ProtocolEngine_0_10(ServerConnection conn, IApplicationRegistry appRegistry, NetworkConnection network)
     {
         super(new Assembler(conn));
         _connection = conn;
         _connection.setConnectionConfig(this);
-        _networkDriver = networkDriver;
         _id = appRegistry.getConfigStore().createId();
         _appRegistry = appRegistry;
-
-        // FIXME Two log messages to maintain compatinbility with earlier protocol versions
-        CurrentActor.get().message(ConnectionMessages.OPEN(null, null, false, false));
-        CurrentActor.get().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);
+        _network = network;
+        
+        _connection.setSender(new Disassembler(_network.getSender(), MAX_FRAME_SIZE));
         _connection.onOpen(new Runnable()
         {
             public void run()
@@ -75,36 +64,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
             }
         });
 
-    }
-
-    public SocketAddress getRemoteAddress()
-    {
-        return _networkDriver.getRemoteAddress();
-    }
-
-    public SocketAddress getLocalAddress()
-    {
-        return _networkDriver.getLocalAddress();
-    }
-
-    public long getReadBytes()
-    {
-        return _readBytes;
-    }
-
-    public long getWrittenBytes()
-    {
-        return _writtenBytes;
-    }
-
-    public void writerIdle()
-    {
-        //Todo
-    }
-
-    public void readerIdle()
-    {
-        //Todo
+        CurrentActor.get().message(ConnectionMessages.OPEN(null, "0-10", false, true));
     }
 
     public VirtualHostConfig getVirtualHost()
@@ -114,7 +74,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ProtocolEngine
 
     public String getAddress()
     {
-        return getRemoteAddress().toString();
+        return _network.getRemoteAddress().toString();
     }
 
     public Boolean isIncoming()