From ab2e0fadcb8f9af41829cdef42f27899ab0c8d06 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 04 Aug 2009 09:30:22 +0000
Subject: [PATCH] Fix for issue 4160 (Connection issue with new dsreplication interactive mode)
---
opends/src/server/org/opends/server/util/cli/ConsoleApplication.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java b/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
index 901de32..ceb0491 100644
--- a/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
+++ b/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -929,11 +929,16 @@
}
}
}
- if (e.getRootCause() != null) {
- if (e.getRootCause().getCause() != null) {
+ if (e.getRootCause() != null)
+ {
+ if (e.getRootCause().getCause() != null &&
+ !ci.isTrustStoreInMemory() &&
+ !ci.isTrustAll())
+ {
if (((e.getRootCause().getCause()
instanceof OpendsCertificateException)) ||
- (e.getRootCause() instanceof SSLHandshakeException)) {
+ (e.getRootCause() instanceof SSLHandshakeException))
+ {
Message message =
ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(
hostName, String.valueOf(portNumber));
@@ -941,7 +946,8 @@
LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
}
}
- if (e.getRootCause() instanceof SSLException) {
+ if (e.getRootCause() instanceof SSLException)
+ {
Message message =
ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(
hostName, String.valueOf(portNumber));
--
Gitblit v1.10.0