From e64015fff32142b8da831329d392fe3f2c79b857 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 17 Oct 2016 12:44:30 +0000
Subject: [PATCH] OPENDJ-3330 Client tool support for TLS v1.2 : fix issues for status, manage-tasks and dsreplication

---
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
index cdb773d..a47831d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
@@ -260,13 +260,15 @@
    * @param err
    *          stream to write error messages
    * @return LDAPConnection created by this class from parsed arguments
+   * @throws SSLConnectionException
+   *           if there was a problem connecting with SSL to the server
    * @throws LDAPConnectionException
-   *           if there was a problem connecting to the server
+   *           if there was any other problem connecting to the server
    * @throws ArgumentException
    *           if there was a problem indicated by the input arguments
    */
   public LDAPConnection connect(LDAPConnectionConsoleInteraction ui, PrintStream out, PrintStream err)
-      throws LDAPConnectionException, ArgumentException
+      throws LDAPConnectionException, SSLConnectionException, ArgumentException
   {
     try
     {
@@ -280,7 +282,7 @@
     {
       err.println(isSSLException(e) ?
           ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(), ui.getPortNumber()) : e.getMessageObject());
-      return null;
+      throw e;
     }
   }
 

--
Gitblit v1.10.0