From 4525af355d0db0cf9edc1da642aacd14ed52f2ba Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 19 Nov 2007 17:14:24 +0000
Subject: [PATCH] Fix for issue 2214 (Provide a manner to accept permanently certificates).
---
opends/src/quicksetup/org/opends/quicksetup/Application.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Application.java b/opends/src/quicksetup/org/opends/quicksetup/Application.java
index 55af64a..7498b28 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Application.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Application.java
@@ -39,6 +39,7 @@
import org.opends.quicksetup.event.ProgressUpdateListener;
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.ProgressMessageFormatter;
+import org.opends.quicksetup.util.UIKeyStore;
import org.opends.quicksetup.ui.GuiApplication;
import org.opends.quicksetup.util.Utils;
@@ -562,7 +563,22 @@
{
if (trustManager == null)
{
- trustManager = new ApplicationTrustManager(null);
+ if (!Utils.isCli())
+ {
+ try
+ {
+ trustManager = new ApplicationTrustManager(UIKeyStore.getInstance());
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING, "Error retrieving UI key store: "+t, t);
+ trustManager = new ApplicationTrustManager(null);
+ }
+ }
+ else
+ {
+ trustManager = new ApplicationTrustManager(null);
+ }
}
return trustManager;
}
--
Gitblit v1.10.0