Author: rgodfrey
Date: Sun May 12 09:42:26 2013
New Revision: 1481502
URL: http://svn.apache.org/r1481502
Log:
QPID-4831 : [Java Broker] Fix closedown on SSL when SSL and TCP can use same
port
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java?rev=1481502&r1=1481501&r2=1481502&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
Sun May 12 09:42:26 2013
@@ -71,7 +71,7 @@ public class SSLBufferingSender implemen
return;
}
log.debug("Closing SSL connection");
-
+ doSend();
engine.closeOutbound();
try
{
@@ -140,7 +140,10 @@ public class SSLBufferingSender implemen
public void send()
{
- doSend();
+ if(!closed.get())
+ {
+ doSend();
+ }
}
public synchronized void send(ByteBuffer appData)
@@ -154,6 +157,10 @@ public class SSLBufferingSender implemen
newBuf.flip();
_appData = newBuf;
}
+ if (closed.get())
+ {
+ throw new SenderException("SSL Sender is closed");
+ }
doSend();
if(!appData.hasRemaining())
{
@@ -169,10 +176,6 @@ public class SSLBufferingSender implemen
private synchronized void doSend()
{
- if (closed.get())
- {
- throw new SenderException("SSL Sender is closed");
- }
HandshakeStatus handshakeStatus;
Status status;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
