From 66962c445640f43cf0b1a0bfef5afc9f05e511ac Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 28 Apr 2009 15:14:27 +0000
Subject: [PATCH] Fix for issue 3943 (Inconsistent installation path across tools) Try to use File.getCanonicalPath to display the paths. If this does not work use File.getAbsolutePath() as fall back.
---
opends/src/server/org/opends/server/tasks/ExportTask.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tasks/ExportTask.java b/opends/src/server/org/opends/server/tasks/ExportTask.java
index b96a75f..f27b2df 100644
--- a/opends/src/server/org/opends/server/tasks/ExportTask.java
+++ b/opends/src/server/org/opends/server/tasks/ExportTask.java
@@ -230,8 +230,15 @@
File f = new File (ldifFile);
if (! f.isAbsolute())
{
- ldifFile = new File(DirectoryServer.getInstanceRoot(), ldifFile)
- .getAbsolutePath();
+ f = new File(DirectoryServer.getInstanceRoot(), ldifFile);
+ try
+ {
+ ldifFile = f.getCanonicalPath();
+ }
+ catch (Exception ex)
+ {
+ ldifFile = f.getAbsolutePath();
+ }
}
attrList = taskEntry.getAttribute(typeBackendID);
--
Gitblit v1.10.0