From 929b2d34bd47d5320a5bc2ffeb5a66fb06ecc35f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 26 Mar 2007 18:22:27 +0000
Subject: [PATCH] Fix for issue 1432 (Uninstall fails on windows due to lock on activation.jar).
---
opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
index 53ea429..ba76a6e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
@@ -527,6 +527,10 @@
if (isWindowsServiceEnabled())
{
status = UninstallProgressStep.DISABLING_WINDOWS_SERVICE;
+ if (displaySeparator)
+ {
+ notifyListeners(getTaskSeparator());
+ }
disableWindowsService();
displaySeparator = true;
}
@@ -943,14 +947,7 @@
return Utils.getPath(getLibrariesPath(), "OpenDS.jar");
}
- /**
- * Returns the path to the aspectj jar file.
- * @return the path to the aspectj jar file.
- */
- private String getAspectJJarPath()
- {
- return Utils.getPath(getLibrariesPath(), "aspectjrt.jar");
- }
+
/**
@@ -1183,7 +1180,7 @@
String line = reader.readLine();
while (line != null)
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (!isFirstLine)
{
buf.append(formatter.getLineBreak());
@@ -1257,7 +1254,7 @@
boolean accept =
!installationPath.equals(file)
- && !librariesFile.equals(file)
+ && !equalsOrDescendant(file, librariesFile)
&& !quicksetupFile.equals(file)
&& !openDSFile.equals(file);
@@ -1434,3 +1431,4 @@
}
}
}
+
--
Gitblit v1.10.0