From 45690fbc42773415ef034419ed3f27d2974b78e1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 21 Nov 2012 23:24:40 +0000
Subject: [PATCH] Fix OPENDJ-649: Add supportedTLSCiphers and supportedTLSProtocols to RootDSE and system monitor
---
opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 1b62eb1..3c686a8 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -55,6 +55,8 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import javax.net.ssl.SSLException;
+
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
import org.opends.server.api.ClientConnection;
@@ -496,8 +498,7 @@
if (connectionHandler.useSSL())
{
- enableSSL(connectionHandler.getTLSByteChannel(this,
- timeoutClientChannel));
+ enableSSL(connectionHandler.getTLSByteChannel(timeoutClientChannel));
}
connectionID = DirectoryServer.newConnectionAccepted(this);
@@ -1615,7 +1616,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- if (asn1Reader.hasRemainingData())
+ if (asn1Reader.hasRemainingData() || (e instanceof SSLException))
{
// The connection failed, but there was an unread partial message so
// interpret this as an IO error.
@@ -2536,7 +2537,7 @@
try
{
TLSByteChannel tlsByteChannel =
- connectionHandler.getTLSByteChannel(this, timeoutClientChannel);
+ connectionHandler.getTLSByteChannel(timeoutClientChannel);
setTLSPendingProvider(tlsByteChannel);
}
catch (DirectoryException de)
--
Gitblit v1.10.0