From d7527cb0c55d3e89e89ab1d532dc511521c5a264 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sun, 10 Aug 2008 23:43:10 +0000
Subject: [PATCH] Fix for 3475 (Java Web Start setup is broken in Mac OS).
---
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 56b1d89..9481c96 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -63,13 +63,26 @@
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.admin.ads.util.PreferredConnection;
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.ButtonName;
+import org.opends.quicksetup.Constants;
+import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.ProgressStep;
+import org.opends.quicksetup.QuickSetupLog;
+import org.opends.quicksetup.ReturnCode;
+import org.opends.quicksetup.SecurityOptions;
+import org.opends.quicksetup.Step;
+import org.opends.quicksetup.UserData;
+import org.opends.quicksetup.UserDataCertificateException;
+import org.opends.quicksetup.UserDataConfirmationException;
+import org.opends.quicksetup.UserDataException;
+import org.opends.quicksetup.WizardStep;
import org.opends.quicksetup.ui.*;
import org.opends.quicksetup.util.IncompatibleVersionException;
import org.opends.quicksetup.util.Utils;
import static org.opends.quicksetup.util.Utils.*;
import static org.opends.quicksetup.Step.*;
-import org.opends.quicksetup.*;
import org.opends.server.util.CertificateManager;
import org.opends.quicksetup.event.ButtonActionListener;
import org.opends.quicksetup.event.ButtonEvent;
@@ -196,8 +209,8 @@
if (!QuickSetupLog.isInitialized())
QuickSetupLog.initLogFileHandler(
File.createTempFile(
- SetupLauncher.LOG_FILE_PREFIX,
- SetupLauncher.LOG_FILE_SUFFIX));
+ Constants.LOG_FILE_PREFIX,
+ Constants.LOG_FILE_SUFFIX));
} catch (IOException e) {
System.err.println("Failed to initialize log");
}
@@ -3942,7 +3955,6 @@
{
suffixes.add(replica.getSuffix());
}
- // BUG: suf can be null here below
getUserData().setSuffixesToReplicateOptions(
new SuffixesToReplicateOptions(type, suffixes, suf.getSuffixes()));
}
--
Gitblit v1.10.0