summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-12-11 14:06:44 +0000
committerKeith Wall <kwall@apache.org>2014-12-11 14:06:44 +0000
commit66c5a217c9891e1dfee14eeb093866373293f265 (patch)
tree39efb4df67f773b883ae6faa5d89c283ae038ccf /qpid/java
parentd558eca0174f9778af78f2906fef580fc8b8e294 (diff)
downloadqpid-python-66c5a217c9891e1dfee14eeb093866373293f265.tar.gz
Only when a port is running TLS only can it be identified early as encrypted (those running both PLAIN/TLS have to wait for the sniff)
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644644 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
index 1f6d50e68f..c056fc0015 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
@@ -99,6 +99,10 @@ public class NonBlockingSenderReceiver implements Runnable, Sender<ByteBuffer>
if(encryptionSet.size() == 1)
{
_transportEncryption = _encryptionSet.iterator().next();
+ if (_transportEncryption == TransportEncryption.TLS)
+ {
+ onTransportEncryptionAction.run();
+ }
}
if(encryptionSet.contains(TransportEncryption.TLS))
@@ -115,7 +119,6 @@ public class NonBlockingSenderReceiver implements Runnable, Sender<ByteBuffer>
_sslEngine.setWantClientAuth(true);
}
_netInputBuffer = ByteBuffer.allocate(_sslEngine.getSession().getPacketBufferSize());
- onTransportEncryptionAction.run();
}
try