Author: rgodfrey Date: Thu Sep 3 15:47:44 2015 New Revision: 1701054 URL: http://svn.apache.org/r1701054 Log: QPID-6262 : Fix case where TLS is used and application buffer has space remaining but it is less than the SSL packet size
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java?rev=1701054&r1=1701053&r2=1701054&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java Thu Sep 3 15:47:44 2015 @@ -172,7 +172,7 @@ public class NonBlockingConnectionTLSDel _applicationBuffer = _applicationBuffer.slice(); _applicationBuffer.limit(unprocessedDataLength); oldApplicationBuffer.dispose(); - if (_applicationBuffer.limit() != _applicationBuffer.capacity()) + if (_applicationBuffer.limit() <= _applicationBuffer.capacity() - _sslEngine.getSession().getApplicationBufferSize()) { _applicationBuffer.position(_applicationBuffer.limit()); _applicationBuffer.limit(_applicationBuffer.capacity()); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org