Author: kwall
Date: Thu Dec 11 14:06:44 2014
New Revision: 1644644
URL: http://svn.apache.org/r1644644
Log:
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)
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
Modified:
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java?rev=1644644&r1=1644643&r2=1644644&view=diff
==============================================================================
---
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
(original)
+++
qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
Thu Dec 11 14:06:44 2014
@@ -99,6 +99,10 @@ public class NonBlockingSenderReceiver
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
_sslEngine.setWantClientAuth(true);
}
_netInputBuffer =
ByteBuffer.allocate(_sslEngine.getSession().getPacketBufferSize());
- onTransportEncryptionAction.run();
}
try
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
