From b45e7fb00a64d2fd8897a485def4296d03c39b55 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Wed, 18 Feb 2009 14:19:40 +0000
Subject: [PATCH] Commit SASL Phase2 changes. Issue 3805. Unit tests to follow later.
---
opends/src/server/org/opends/server/extensions/TLSByteChannel.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/TLSByteChannel.java b/opends/src/server/org/opends/server/extensions/TLSByteChannel.java
index ee7b92b..4437367 100644
--- a/opends/src/server/org/opends/server/extensions/TLSByteChannel.java
+++ b/opends/src/server/org/opends/server/extensions/TLSByteChannel.java
@@ -205,6 +205,8 @@
SSLEngineResult.HandshakeStatus hsStatus;
if(!reading)
appNetData.clear();
+ else
+ reading = false;
if(!socketChannel.isOpen())
return -1;
if(sslEngine.isInboundDone())
@@ -369,8 +371,7 @@
throw new ClosedChannelException();
else if (bytesWritten == 0) {
int bytesSent = netData.remaining();
- if(!StaticUtils.writeWithTimeout(
- connection, socketChannel, netData))
+ if(!StaticUtils.writeWithTimeout(connection, netData))
throw new ClosedChannelException();
totBytesSent += bytesSent;
} else
--
Gitblit v1.10.0