You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/06/11 13:07:35 UTC
svn commit: r1684853 -
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
Author: rgodfrey
Date: Thu Jun 11 11:07:35 2015
New Revision: 1684853
URL: http://svn.apache.org/r1684853
Log:
QPID-6429 : NonBlockingConnection.doWrite() may incorrectly return true when all output has been TLS encrypted by the SSLEngine, but not yet written to the wire
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1684853&r1=1684852&r2=1684853&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java Thu Jun 11 11:07:35 2015
@@ -590,7 +590,7 @@ public class NonBlockingConnection imple
}
}
- return bufArray.length == byteBuffersWritten;
+ return (bufArray.length == byteBuffersWritten) && _encryptedOutput.isEmpty();
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org