From 5c35407b132d21857b59d6dd20442f7cf341eeed Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 15 Jan 2008 17:36:59 +0000
Subject: [PATCH] Fix for issue 2818 (Cannot start replication ifthe second server created using quicksetup tool)
---
opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java | 2 +-
opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 2 +-
opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java | 10 ++++++++++
opends/src/quicksetup/org/opends/quicksetup/Application.java | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
index f14aa35..a34e6e1 100644
--- a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -59,7 +59,7 @@
*/
public class ConnectionUtils
{
- private static final int DEFAULT_LDAP_CONNECT_TIMEOUT = 10000;
+ private static final int DEFAULT_LDAP_CONNECT_TIMEOUT = 30000;
private static final String STARTTLS_PROPERTY =
"org.opends.connectionutils.isstarttls";
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index f1628be..e23b86f 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -1288,7 +1288,7 @@
/**
* {@inheritDoc}
*/
- protected ApplicationTrustManager getTrustManager()
+ public ApplicationTrustManager getTrustManager()
{
return getUninstallUserData().getTrustManager();
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Application.java b/opends/src/quicksetup/org/opends/quicksetup/Application.java
index 317920b..ffd8b1c 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Application.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Application.java
@@ -576,7 +576,7 @@
* Returns the trust manager that can be used to establish secure connections.
* @return the trust manager that can be used to establish secure connections.
*/
- protected ApplicationTrustManager getTrustManager()
+ public ApplicationTrustManager getTrustManager()
{
if (trustManager == null)
{
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java b/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
index cea4e94..0710ba5 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
@@ -27,6 +27,7 @@
package org.opends.quicksetup.installandupgrader;
+import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.messages.Message;
import static org.opends.messages.QuickSetupMessages.*;
@@ -532,4 +533,13 @@
}
return userData;
}
+
+ /**
+ * Returns the trust manager that can be used to establish secure connections.
+ * @return the trust manager that can be used to establish secure connections.
+ */
+ public ApplicationTrustManager getTrustManager()
+ {
+ return getDelegateApplication().getTrustManager();
+ }
}
--
Gitblit v1.10.0