From c8447177b6c9d155ea48009583a20ecce7ffd8c6 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 18 Jan 2010 22:27:40 +0000
Subject: [PATCH] Fix for issue 3901 (Setup fails when inserting a server in a replication topology with large umount of data) - Add a 'Runtime Options' step in the wizard.  By default this will contain just two labels and two buttons: Server Runtime Options: Use Default <button to change> Import Options: Use Default <button to change>

---
 opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 469cea1..516a8d5 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2009 Sun Microsystems, Inc.
+ *      Copyright 2006-2010 Sun Microsystems, Inc.
  */
 
 package org.opends.guitools.uninstaller;
@@ -603,7 +603,7 @@
    * {@inheritDoc}
    */
   public String getInstancePath() {
-    return getInstancePathFromClasspath(getInstallPathFromClasspath());
+    return getInstancePathFromInstallPath(getInstallPathFromClasspath());
   }
 
   /**
@@ -1165,7 +1165,7 @@
     }
 
     String instancePath =
-      Utils.getInstancePathFromClasspath(installFile.getAbsolutePath());
+      Utils.getInstancePathFromInstallPath(installFile.getAbsolutePath());
     File instanceFile = new File(instancePath);
     try
     {
@@ -1173,7 +1173,7 @@
     } catch (Exception e)
     {
       instancePath =
-        Utils.getInstancePathFromClasspath(installFile.getAbsolutePath());
+        Utils.getInstancePathFromInstallPath(installFile.getAbsolutePath());
     }
 
     InstallationFilesToDeleteFilter filter =

--
Gitblit v1.10.0