diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-01-27 11:18:39 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-01-27 11:18:39 +0000 |
| commit | f033f35e60156891d48cb4b9897e51642defd542 (patch) | |
| tree | 2f6235eac1ab093bac16968d4c3ff8ebf52ab79f /qpid/java/common/src | |
| parent | a235cd50b4ab18082b695d3f784c846e41ced5ee (diff) | |
| download | qpid-python-f033f35e60156891d48cb4b9897e51642defd542.tar.gz | |
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@1064084 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java | 2 | ||||
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java | 6 |
2 files changed, 2 insertions, 6 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 fa3c1737a7..8abae7a23e 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 @@ -434,7 +434,7 @@ public class Connection extends ConnectionInvoker } } - Session getSession(int channel) + protected Session getSession(int channel) { synchronized (lock) { diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java index 4e6d2130ae..dd6a37eca2 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java +++ b/qpid/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() { |