diff options
author | Aidan Skinner <aidan@apache.org> | 2009-09-16 10:06:55 +0000 |
---|---|---|
committer | Aidan Skinner <aidan@apache.org> | 2009-09-16 10:06:55 +0000 |
commit | 9c4ecc45da929750ff7f0e0a5d7ada4e674b9105 (patch) | |
tree | 3834f1b7f1fe3fbdd632a9c78f6295e54595abc5 /qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java | |
parent | c1ebe66bfab328c5192a35c21ea290b5c45f40f5 (diff) | |
download | qpid-python-9c4ecc45da929750ff7f0e0a5d7ada4e674b9105.tar.gz |
QPID-2105: Make NetworkDriver.open use a SSLContextFactory, not an SSLEngine.
Allow an existing SocketConnector to be passed into a MINANetworkDriver, for
use with the ExistingSocket bit of TransportConnection.
Move the ExistingSocket stuff to one place, use MINANetworkDriver in
TransportConnection and make AMQProtocolHandler implement ProtocolEngine. Remove MINA specific gubbins from AMQProtocolHandler and AMQProtocolSession.
Move fireAsynchEvent to Job
Add getLocalAddress to AMQProtocolEngine
Move TestNetworkDriver to common
Use correct class for logger in AMQProtocolEngine
Check the exception is thrown properly in SimpleACLTest, make it a little less
prone to obscure race conditions.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815704 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java')
-rw-r--r-- | qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java index 6024875cf5..5500ff9d4b 100644 --- a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java +++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java @@ -382,6 +382,18 @@ public class MINANetworkDriverTest extends TestCase return null; } } + + public SocketAddress getLocalAddress() + { + if (_driver != null) + { + return _driver.getLocalAddress(); + } + else + { + return null; + } + } public long getWrittenBytes() { @@ -459,6 +471,7 @@ public class MINANetworkDriverTest extends TestCase { return _closed; } + } private class EchoProtocolEngine extends CountingProtocolEngine |