QPID-3021: set the session/connection actor when the connection recieves new events, ensure the correct thread logs close

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

2 files changed, 2 insertions, 6 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index fa3c1737a7..8abae7a23e 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -434,7 +434,7 @@ public class Connection extends ConnectionInvoker
         }
     }
 
-    Session getSession(int channel)
+    protected Session getSession(int channel)
     {
         synchronized (lock)
         {
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
index 4e6d2130ae..dd6a37eca2 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
@@ -52,7 +52,6 @@ public class IoNetworkTransport implements NetworkTransport, IoContext
     private long timeout = 60000; 
     private ConnectionSettings settings;    
     
-    @Override
     public void init(ConnectionSettings settings)
     {
         try
@@ -84,20 +83,17 @@ public class IoNetworkTransport implements NetworkTransport, IoContext
         }
     }
 
-    @Override
     public void receiver(Receiver<ByteBuffer> delegate)
     {
         receiver = new IoReceiver(this, delegate,
                 2*settings.getReadBufferSize() , timeout);
     }
 
-    @Override
     public Sender<ByteBuffer> sender()
     {
         return new IoSender(this, 2*settings.getWriteBufferSize(), timeout);
     }
-    
-    @Override
+
     public void close()
     {