1 files changed, 6 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
index 182ef1ed82..fd6e9300ec 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
@@ -47,7 +47,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
     private long _readBytes;
     private long _writtenBytes;
     private ServerConnection _connection;
-    private final UUID _id;
+    private final UUID _qmfId;
     private final IApplicationRegistry _appRegistry;
     private long _createTime = System.currentTimeMillis();
 
@@ -59,7 +59,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
         _connection = conn;
         _connection.setConnectionConfig(this);
 
-        _id = appRegistry.getConfigStore().createId();
+        _qmfId = appRegistry.getConfigStore().createId();
         _appRegistry = appRegistry;
 
         if(network != null)
@@ -88,7 +88,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
         _network = network;
 
         _connection.setSender(new Disassembler(sender, MAX_FRAME_SIZE));
-
+        _connection.setPeerPrincipal(_network.getPeerPrincipal());
         // FIXME Two log messages to maintain compatibility with earlier protocol versions
         _connection.getLogActor().message(ConnectionMessages.OPEN(null, null, null, false, false, false));
         _connection.getLogActor().message(ConnectionMessages.OPEN(null, "0-10", null, false, true, false));
@@ -180,9 +180,10 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
         return _appRegistry.getConfigStore();
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public ConnectionConfigType getConfigType()