QPID-2835 Implement CON Operational Logging on 0-10

Committed patch from SorinS <ssuciu@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1003984 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 19 insertions, 14 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index 3c56aa22bd..174dc54a72 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslServer;
@@ -111,9 +112,10 @@ public class Connection extends ConnectionInvoker
     private String userID;
     private ConnectionSettings conSettings;
     private SecurityLayer securityLayer;
+    private String _clientId;
     
-    // want to make this final
-    private int _connectionId;
+    private static final AtomicLong idGenerator = new AtomicLong(0);
+    private final long _connectionId = idGenerator.incrementAndGet();
 
     public Connection() {}
 
@@ -147,6 +149,16 @@ public class Connection extends ConnectionInvoker
         }
     }
 
+    public String getClientId()
+    {
+        return _clientId;
+    }
+
+    public void setClientId(String id)
+    {
+        _clientId = id;
+    }
+
     void setLocale(String locale)
     {
         this.locale = locale;
@@ -321,12 +333,7 @@ public class Connection extends ConnectionInvoker
         _sessionFactory = sessionFactory;
     }
 
-    public void setConnectionId(int id)
-    {
-        _connectionId = id;
-    }
-
-    public int getConnectionId()
+    public long getConnectionId()
     {
         return _connectionId;
     }
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 3bd5c7fe0d..644a2daa58 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
@@ -69,6 +69,9 @@ public class ServerDelegate extends ConnectionDelegate
         conn.setLocale(ok.getLocale());
         String mechanism = ok.getMechanism();
 
+        String clientName = (String) ok.getClientProperties().get("clientName");
+        conn.setClientId(clientName);
+
         if (mechanism == null || mechanism.length() == 0)
         {
             conn.connectionTune
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
index 3bc6730623..84e66c25bd 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
@@ -20,8 +20,6 @@ package org.apache.qpid.transport.network.nio;
  * 
  */
 
-
-import java.io.EOFException;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -30,7 +28,6 @@ import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.qpid.transport.Connection;
 import org.apache.qpid.transport.ConnectionDelegate;
@@ -44,8 +41,7 @@ public class NioHandler implements Runnable
     private Receiver<ByteBuffer> _receiver;
     private SocketChannel _ch;
     private ByteBuffer _readBuf;
-    private static Map<Integer,NioSender> _handlers = new ConcurrentHashMap<Integer,NioSender>();
-    private AtomicInteger _count = new AtomicInteger();
+    private static Map<Long,NioSender> _handlers = new ConcurrentHashMap<Long,NioSender>();
 
     private NioHandler(){}
 
@@ -91,7 +87,6 @@ public class NioHandler implements Runnable
         con.setSender(new Disassembler(sender, 64*1024 - 1));
         con.setConnectionDelegate(delegate);
 
-        con.setConnectionId(_count.incrementAndGet());
         _handlers.put(con.getConnectionId(),sender);
 
         _receiver = new InputHandler(new Assembler(con), InputHandler.State.FRAME_HDR);