From d1e7623efb18d7710dc9c432fa7cb78600258548 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Fri, 24 Apr 2009 17:05:14 +0000
Subject: [PATCH] Fix for issue where unit tests hang when the startTLS extended operation is used.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
index 115a22f..9fbeab1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
@@ -36,8 +36,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.DisconnectReason;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
@@ -169,27 +167,6 @@
// TLS was successfully enabled on the client connection, but we need to
// send the response in the clear.
operation.setResultCode(ResultCode.SUCCESS);
-
- try
- {
- tlsCapableConnection.sendClearResponse(operation);
- operation.setResponseSent();
- tlsCapableConnection.enableTLS();
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- logError(ERR_STARTTLS_ERROR_SENDING_CLEAR_RESPONSE.get(
- getExceptionMessage(e)));
-
- clientConnection.disconnect(DisconnectReason.SECURITY_PROBLEM, false,
- ERR_STARTTLS_ERROR_SENDING_CLEAR_RESPONSE.get(
- getExceptionMessage(e)));
- }
}
}
--
Gitblit v1.10.0