mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

lutoff
23.12.2008 34119798b0bb8e3960a7616d8ee2158fee0c15b4
fix for issue #3490 ( Uninstall produces a lot of erroneous warnings...)	
1 files modified
23 ■■■■■ changed files
opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java 23 ●●●●● patch | view | raw | blame | history
opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -1112,18 +1112,39 @@
      notifyListeners(getFormattedWithPoints(
          INFO_PROGRESS_DELETING_INSTALLATION_FILES_NON_VERBOSE.get()));
    }
    String installPath = getInstallPathFromClasspath();
    File installFile = new File(installPath);
    try
    {
      installPath = installFile.getCanonicalPath();
    }
    catch(Exception e)
    {
      installPath = getInstallPathFromClasspath();
    }
    String instancePath =
      Utils.getInstancePathFromClasspath(installFile.getAbsolutePath());
    File instanceFile = new File(instancePath);
    try
    {
      instancePath = instanceFile.getCanonicalPath();
    } catch (Exception e)
    {
      instancePath =
        Utils.getInstancePathFromClasspath(installFile.getAbsolutePath());
    }
    InstallationFilesToDeleteFilter filter =
            new InstallationFilesToDeleteFilter();
    File[] installFiles  = installFile.listFiles();
    File[] instanceFiles = new File(instancePath).listFiles();
    File[] instanceFiles  = null ;
    if (! installPath.equals(instancePath))
    {
      instanceFiles = new File(instancePath).listFiles();
    }
    File[] rootFiles = null;