From bc247971096268630f67130974fccbb3a6e23be5 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 Mar 2013 09:11:48 +0000
Subject: [PATCH] OPENDJ-808 Implement a simple commons REST based HTTP connection handler
---
opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java b/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
index 1854c48..f4d031d 100644
--- a/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
+++ b/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -132,8 +133,6 @@
if (clientConnection == null)
{
operation.setResultCode(ResultCode.UNAVAILABLE);
-
-
operation.appendErrorMessage(ERR_STARTTLS_NO_CLIENT_CONNECTION.get());
return;
}
@@ -149,14 +148,12 @@
else
{
operation.setResultCode(ResultCode.UNAVAILABLE);
-
-
operation.appendErrorMessage(ERR_STARTTLS_NOT_TLS_CAPABLE.get());
return;
}
MessageBuilder unavailableReason = new MessageBuilder();
- if (! tlsCapableConnection.isTLSAvailable(unavailableReason))
+ if (! tlsCapableConnection.isStartTLSAvailable(unavailableReason))
{
operation.setResultCode(ResultCode.UNAVAILABLE);
operation.setErrorMessage(unavailableReason);
--
Gitblit v1.10.0